Drop qt4 related packaging.

[packaging] Drop qt4 related packaging. Signed-off-by: Marko Saukko <marko.saukko@jolla.com>
sailfishos · Mar 15, 2015 · 2fd7269 · 2fd7269
1 parent 00f94a6
commit 2fd7269
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 122 deletions.
diff --git a/connman-qt.pro b/connman-qt.pro
@@ -15,14 +15,5 @@ include(coverage.pri)
 example {
    SUBDIRS += examples/counters
 }
-equals(QT_MAJOR_VERSION, 4):  {
-# CONFIG flag to disable automatic test
-    !notests {
-    # fixme for qt5
-        SUBDIRS += tests
-    }
-    OTHER_FILES += rpm/connman-qt.spec
-}
-equals(QT_MAJOR_VERSION, 5):  {
-    OTHER_FILES += rpm/connman-qt5.spec
-}
+
+OTHER_FILES += rpm/connman-qt5.spec
diff --git a/examples/counters/counters.pro b/examples/counters/counters.pro
@@ -13,9 +13,6 @@ isEmpty(TARGET_SUFFIX) {
 }
 PKGCONFIG += connman-$$TARGET_SUFFIX
 
-equals(QT_MAJOR_VERSION, 4): {
-    QT -= gui
-}
 SOURCES += main.cpp \
     networkcounter.cpp
 

diff --git a/plugin/plugin.pro b/plugin/plugin.pro
@@ -14,18 +14,11 @@ isEmpty(TARGET_SUFFIX) {
 
 LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
 
-equals(QT_MAJOR_VERSION, 4): {
-    QT += declarative
-}
-
-equals(QT_MAJOR_VERSION, 5): {
-    QT += qml
-    OTHER_FILES += plugin.json qmldirs
-}
+QT += qml
+OTHER_FILES += plugin.json qmldirs
 
 MODULENAME = MeeGo/Connman
-equals(QT_MAJOR_VERSION, 4): TARGETPATH = $$[QT_INSTALL_IMPORTS]/$$MODULENAME
-equals(QT_MAJOR_VERSION, 5): TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
+TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
 
 target.path = $$TARGETPATH
 qmldir.files += qmldir

diff --git a/rpm/connman-qt.spec b/rpm/connman-qt.spec