Merge commit '7a9a46235932909b2404e1fbb9cb64fa44bfc81f' into testupgr…

…ade857

Conflicts:
	libsignon/lib/SignOn/dbusoperationqueuehandler.cpp
	libsignon/lib/SignOn/dbusoperationqueuehandler.h
	libsignon/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp
	libsignon/server/com.google.code.AccountsSSO.SingleSignOn.service.in
	libsignon/server/com.nokia.SingleSignOn.Backup.service.in
	libsignon/tests/tests.pro

libsignon/.gitignore

@@ -24,6 +24,10 @@ coverage.info
 debian
 doc/html
 doc/qch
+lib/SignOn/SignOnQt*.cmake
 lib/SignOn/doc/html
 lib/SignOn/doc/qch
+server/com.google.code.AccountsSSO.SingleSignOn.service
+server/com.nokia.SingleSignOn.Backup.service
 signon-*.tar.bz2
+tests/com.google.code.AccountsSSO.SingleSignOn.service

libsignon/common-project-config.pri

@@ -33,6 +33,17 @@ DEFINES += DEBUG_ENABLED
 #TODO comment this to restrict plugins to run under signon user
 DEFINES += NO_SIGNON_USER
 
+# Qt4/Qt5 common checks
+greaterThan(QT_MAJOR_VERSION, 4) {
+    LIBSIGNON = libsignon-qt5
+    CMAKE_BASENAME = SignOnQt5
+    LIBQTCORE = Qt5Core
+} else {
+    LIBSIGNON = libsignon-qt
+    CMAKE_BASENAME = SignOnQt
+    LIBQTCORE = QtCore
+}
+
 #-----------------------------------------------------------------------------
 # setup the installation prefix
 #-----------------------------------------------------------------------------
@@ -70,6 +81,15 @@ isEmpty( LIBDIR ) {
     message("==== library install path set to `$${INSTALL_LIBDIR}'")
 }
 
+isEmpty ( CMAKE_CONFIG_PATH ) {
+    CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/$${CMAKE_BASENAME}
+    message("====")
+    message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'")
+    message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')")
+} else {
+    message("====")
+    message("==== cmake module install path set to `$${CMAKE_CONFIG_PATH}'")
+}
 
 # Default directory for signond extensions
 _EXTENSIONS = $$(SIGNOND_EXTENSIONS_DIR)

libsignon/common-vars.pri

@@ -14,7 +14,7 @@ PROJECT_NAME = signon
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 8.50
+PROJECT_VERSION = 8.57
 
 #-----------------------------------------------------------------------------
 # Library version

libsignon/lib/SignOn/SignOnQt5Config.cmake.in

@@ -0,0 +1,7 @@
+#  SIGNONQT_INCLUDE_DIRS - The libsignon-qt include directories
+#  SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
+#  SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt
+
+set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a)
+set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})

libsignon/lib/SignOn/SignOnQt5ConfigVersion.cmake.in

@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION $${PROJECT_VERSION})
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE TRUE)
+   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+      set(PACKAGE_VERSION_EXACT TRUE)
+   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )

libsignon/lib/SignOn/SignOnQtConfig.cmake.in

@@ -0,0 +1,7 @@
+#  SIGNONQT_INCLUDE_DIRS - The libsignon-qt include directories
+#  SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
+#  SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt
+
+set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a)
+set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})

libsignon/lib/SignOn/SignOnQtConfigVersion.cmake.in

@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION $${PROJECT_VERSION})
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE TRUE)
+   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+      set(PACKAGE_VERSION_EXACT TRUE)
+   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )