From 3670b1a42fb6b705801ccd86efe24ed654d237e5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 11 Mar 2009 18:16:12 +0100
Subject: [PATCH] remove qt < 4.5 #ifdefs
---
src/plugins/designer/formeditorplugin.cpp | 3 ---
src/shared/proparser/profileevaluator.cpp | 7 -------
2 files changed, 10 deletions(-)
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index e132047df38..3052c173585 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 e1c067eee5e..522438d7ce6 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);
--
GitLab