diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index e132047df3850a91171252380e41dbeb324253b6..3052c1735855fcd76bc38302eab57c74d2b56546 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -38,9 +38,6 @@ #endif #include "designerconstants.h" -#if QT_VERSION < 0x040500 -# include "settings.h" -#endif #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index e1c067eee5e61225432376ce2ff6c318294fe0c8..522438d7ce6aeb36570846c5a9b72d49b5b7a9f6 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -2310,17 +2310,10 @@ void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringL + visitor.values(QLatin1String("FORMS3")); sourceFiles << forms; -#if QT_VERSION >= 0x040500 sourceFiles.sort(); sourceFiles.removeDuplicates(); tsFileNames.sort(); tsFileNames.removeDuplicates(); -#else - sourceFiles = sourceFiles.toSet().toList(); - sourceFiles.sort(); - tsFileNames = tsFileNames.toSet().toList(); - tsFileNames.sort(); -#endif varMap->insert("SOURCES", sourceFiles); varMap->insert("CODECFORTR", QStringList() << codecForTr);