Merge branch 'master' of https://github.com/nemomobile-packages/messa…

…gingframework
sailfishos · May 2, 2014 · 82973d7 · 82973d7
2 parents c1ef90c + 0f5ab06
commit 82973d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/qmf/src/libraries/qmfclient/qmfclient.pro b/qmf/src/libraries/qmfclient/qmfclient.pro
@@ -186,17 +186,15 @@ packagesExist(accounts-qt) | packagesExist(accounts-qt5) {
                ssosessionmanager.cpp \
                ssoauthplugin.cpp
 
-    contains(DEFINES,INSTALL_SSO_PROVIDER) {
-        # Install email SSO provider description
-        sso_providers.files = share/email.provider
-        sso_providers.path  = $$QMF_INSTALL_ROOT/share/accounts/providers
+    # Install email SSO provider description
+    sso_providers.files = share/email.provider
+    sso_providers.path  = $$QMF_INSTALL_ROOT/share/accounts/providers
 
-        # Install email SSO service description
-        sso_services.files = share/email.service
-        sso_services.path  = $$QMF_INSTALL_ROOT/share/accounts/services
+    # Install email SSO service description
+    sso_services.files = share/email.service
+    sso_services.path  = $$QMF_INSTALL_ROOT/share/accounts/services
 
-        INSTALLS += sso_providers sso_services
-    }
+    INSTALLS += sso_providers sso_services
 
 } else {
      warning("Accounts-qt support requires accounts-qt")

diff --git a/rpm/qmf-qt5.spec b/rpm/qmf-qt5.spec
@@ -254,6 +254,7 @@ ln -sf ../messageserver5.service "$UNIT_DIR/messageserver5.service"
 %files tests
 %defattr(-,root,root,-)
 # >> files tests
+%{_datadir}/accounts/*
 /opt/tests/qmf-qt5/*
 # << files tests