feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

remove qt < 4.5 #ifdefs

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-03-11 18:16:12 +01:00
parent 027b52a25d
commit 3670b1a42f
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/designer/formeditorplugin.cpp
View File

@@ -38,9 +38,6 @@
#endif #endif
#include "designerconstants.h" #include "designerconstants.h"
#if QT_VERSION < 0x040500
# include "settings.h"
#endif
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>

7
src/shared/proparser/profileevaluator.cpp
View File

@@ -2310,17 +2310,10 @@ void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringL
+ visitor.values(QLatin1String("FORMS3")); + visitor.values(QLatin1String("FORMS3"));
sourceFiles << forms; sourceFiles << forms;
#if QT_VERSION >= 0x040500
sourceFiles.sort(); sourceFiles.sort();
sourceFiles.removeDuplicates(); sourceFiles.removeDuplicates();
tsFileNames.sort(); tsFileNames.sort();
tsFileNames.removeDuplicates(); tsFileNames.removeDuplicates();
#else
sourceFiles = sourceFiles.toSet().toList();
sourceFiles.sort();
tsFileNames = tsFileNames.toSet().toList();
tsFileNames.sort();
#endif
varMap->insert("SOURCES", sourceFiles); varMap->insert("SOURCES", sourceFiles);
varMap->insert("CODECFORTR", QStringList() << codecForTr); varMap->insert("CODECFORTR", QStringList() << codecForTr);