Removes Qt5 conditional code

The project is only an Qt4 one. Qt5 already includes this functionality
in QtCore/QMimeType

Change-Id: I15e7d0a0a4d254cd2ffd2ff57f340302534e34e9
Signed-off-by: Luís Pereira <luis.artur.pereira@gmail.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>

7 files changed, 0 insertions, 43 deletions

diff --git a/examples/mimetypeviewer/main.cpp b/examples/mimetypeviewer/main.cpp
index 8186b11..f36d346 100644
--- a/examples/mimetypeviewer/main.cpp
+++ b/examples/mimetypeviewer/main.cpp
@@ -1,10 +1,6 @@
 #include "mimetypeviewer.h"
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#include <QtWidgets/QApplication>
-#else
 #include <QtGui/QApplication>
-#endif
 
 int main(int argc, char *argv[])
 {
diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp
index d8d379d..2589874 100644
--- a/src/mimetypes/qmimedatabase.cpp
+++ b/src/mimetypes/qmimedatabase.cpp
@@ -523,14 +523,9 @@ QMimeType QMimeDatabase::mimeTypeForData(QIODevice *device) const
 */
 QMimeType QMimeDatabase::mimeTypeForUrl(const QUrl &url) const
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    if (url.isLocalFile())
-        return mimeTypeForFile(url.toLocalFile());
-#else
     QString localFile(url.toLocalFile());
     if (!localFile.isEmpty())
         return mimeTypeForFile(localFile);
-#endif
 
     const QString scheme = url.scheme();
     if (scheme.startsWith(QLatin1String("http")))
diff --git a/src/mimetypes/qmimedatabase.h b/src/mimetypes/qmimedatabase.h
index 51485d1..f573ee8 100644
--- a/src/mimetypes/qmimedatabase.h
+++ b/src/mimetypes/qmimedatabase.h
@@ -88,21 +88,7 @@ public:
     QMimeType mimeTypeForUrl(const QUrl &url) const;
     QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const;
     QMimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const;
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#if QT_DEPRECATED_SINCE(5,0)
-    QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const {
-        return mimeTypeForFileNameAndData(fileName, device);
-    }
-
-    QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const {
-        return mimeTypeForFileNameAndData(fileName, data);
-    }
-#endif
-#endif
-
     QString suffixForFileName(const QString &fileName) const;
-
     QList<QMimeType> allMimeTypes() const;
 
 private:
diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp
index 4f80db4..76f874e 100644
--- a/src/mimetypes/qmimetype.cpp
+++ b/src/mimetypes/qmimetype.cpp
@@ -281,9 +281,6 @@ QString QMimeType::comment() const
 
     QStringList languageList;
     languageList << QLocale::system().name();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    languageList << QLocale::system().uiLanguages();
-#endif
     Q_FOREACH (const QString &language, languageList) {
         const QString lang = language == QLatin1String("C") ? QLatin1String("en_US") : language;
         const QString comm = d->localeComments.value(lang);
diff --git a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp
index 814a63a..b2d429f 100644
--- a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp
+++ b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp
@@ -41,13 +41,7 @@
 
 #include <QtCore/qglobal.h>
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#include <QtQuickTest/quicktest.h>
-
-QUICK_TEST_MAIN(mytest)
-#else
 int main()
 {
     return 1;
 }
-#endif
diff --git a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp
index 814a63a..b2d429f 100644
--- a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp
+++ b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp
@@ -41,13 +41,7 @@
 
 #include <QtCore/qglobal.h>
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#include <QtQuickTest/quicktest.h>
-
-QUICK_TEST_MAIN(mytest)
-#else
 int main()
 {
     return 1;
 }
-#endif
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
index e1f23dd..d478e93 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
@@ -46,13 +46,8 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#include <QtConcurrent/QtConcurrentRun>
-#include <QtConcurrent/QFuture>
-#else
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QFuture>
-#endif
 
 #include <QtTest/QtTest>