[qmf] Fix build for systems no having accounts-sso support

sailfishos · Jul 16, 2014 · c982095 · c982095
1 parent 0e55361
commit c982095
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 46 deletions.
diff --git a/qmf/common.pri b/qmf/common.pri
@@ -2,39 +2,20 @@ CONFIG(debug,debug|release) {
     DEFINES += QMF_ENABLE_LOGGING
 }
 
-equals(QT_MAJOR_VERSION, 4) {
-    packagesExist(accounts-qt) {
-        packagesExist(libsignon-qt) {
-            DEFINES += USE_ACCOUNTS_QT
-            CONFIG += link_pkgconfig
-            QT += xml
-            # accounts dependencies
-            PKGCONFIG += accounts-qt
-            # sso dependencies
-            PKGCONFIG += libsignon-qt
-        } else {
-            warning("Accounts-qt support requires libsignon-qt")
-        }
-    } else {
-         warning("Accounts-qt support requires accounts-qt")
-    }
-}
-equals(QT_MAJOR_VERSION, 5) {
-    packagesExist(accounts-qt5) {
-        packagesExist(libsignon-qt5) {
-            DEFINES += USE_ACCOUNTS_QT
-            CONFIG += link_pkgconfig
-            QT += xml
-            # accounts dependencies
-            PKGCONFIG += accounts-qt5
-            # sso dependencies
-            PKGCONFIG += libsignon-qt5
-        } else {
-            warning("Accounts-qt support requires libsignon-qt5")
-        }
+packagesExist(accounts-qt5) {
+    packagesExist(libsignon-qt5) {
+        DEFINES += USE_ACCOUNTS_QT
+        CONFIG += link_pkgconfig
+        QT += xml
+        # accounts dependencies
+        PKGCONFIG += accounts-qt5
+        # sso dependencies
+        PKGCONFIG += libsignon-qt5
     } else {
-         warning("Accounts-qt support requires accounts-qt5")
+        warning("Accounts-qt support requires libsignon-qt5")
     }
+} else {
+     warning("Accounts-qt support requires accounts-qt5")
 }
 
 win32 | macx {

diff --git a/qmf/src/libraries/qmfclient/qmfclient.pro b/qmf/src/libraries/qmfclient/qmfclient.pro
@@ -170,7 +170,7 @@ TRANSLATIONS += libqtopiamail-ar.ts \
                 libqtopiamail-zh_CN.ts \
                 libqtopiamail-zh_TW.ts
 
-packagesExist(accounts-qt) | packagesExist(accounts-qt5) {
+packagesExist(accounts-qt5) {
 
     PUBLIC_HEADERS += \
                ssoaccountmanager.h \

diff --git a/qmf/src/plugins/messageservices/smtp/smtp.pro b/qmf/src/plugins/messageservices/smtp/smtp.pro
@@ -24,18 +24,10 @@ QT = core network
 contains(DEFINES,USE_ACCOUNTS_QT) {
     CONFIG += link_pkgconfig
     QT += xml
-    equals(QT_MAJOR_VERSION, 4) {
-        # accounts dependencies
-        PKGCONFIG += accounts-qt
-        # sso dependencies
-        PKGCONFIG += libsignon-qt
-    }
-    equals(QT_MAJOR_VERSION, 5) {
-        # accounts dependencies
-        PKGCONFIG += accounts-qt5
-        # sso dependencies
-        PKGCONFIG += libsignon-qt5
-    }
+    # accounts dependencies
+    PKGCONFIG += accounts-qt5
+    # sso dependencies
+    PKGCONFIG += libsignon-qt5
 }
 
 DEPENDPATH += .

diff --git a/qmf/src/plugins/plugins.pro b/qmf/src/plugins/plugins.pro
@@ -6,7 +6,7 @@ SUBDIRS = \
     messageservices/qmfsettings \
     contentmanagers/qmfstoragemanager
 
-packagesExist(accounts-qt) | packagesExist(accounts-qt5) {
+packagesExist(accounts-qt5) {
     SUBDIRS += ssoauth/password
 }
 
diff --git a/qmf/src/tools/tools.pro b/qmf/src/tools/tools.pro
@@ -1,3 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = messageserver
-equals(QT_MAJOR_VERSION, 5): SUBDIRS += accountscheck
+
+packagesExist(accounts-qt5) {
+    SUBDIRS += accountscheck
+}