--- generator/typesystem_core-common.xml.orig 2015-03-20 18:01:15.000000000 +0100 +++ generator/typesystem_core-common.xml 2015-03-20 18:01:39.000000000 +0100 @@ -1387,7 +1387,6 @@ - --- generator/typesystem_core-qtscript.xml.orig 2015-03-20 18:01:15.000000000 +0100 +++ generator/typesystem_core-qtscript.xml 2015-03-20 18:01:49.000000000 +0100 @@ -1115,13 +1115,6 @@ - - - - - - - --- generator/typesystem_core.xml.orig 2015-03-20 18:01:15.000000000 +0100 +++ generator/typesystem_core.xml 2015-03-20 18:01:56.000000000 +0100 @@ -2452,13 +2452,6 @@ - - - - - - - --- qtbindings/qtscript_core/qtscriptconcurrent.h.orig 2012-01-23 12:30:03.000000000 +0100 +++ qtbindings/qtscript_core/qtscriptconcurrent.h 2015-03-20 18:01:59.000000000 +0100 @@ -55,7 +55,6 @@ typedef QFuture QtScriptFuture; typedef QFutureWatcher QtScriptFutureWatcher; typedef QFutureSynchronizer QtScriptFutureSynchronizer; -typedef QFutureIterator QtScriptFutureIterator; #endif // QT_NO_CONCURRENT