diff -Nru qt5-systems-0.1~git20120402/config.log qt5-systems-0.1~git20120423/config.log --- qt5-systems-0.1~git20120402/config.log 2012-04-02 12:56:25.000000000 +0000 +++ qt5-systems-0.1~git20120423/config.log 2012-04-24 07:33:29.000000000 +0000 @@ -5,18 +5,18 @@ executing config test "x11": + /opt/qt5/bin/qmake CONFIG-=debug_and_release CONFIG-=app_bundle + make -make[1]: Entering directory `/home1/kate/qt5/qt5-20120402/qtsystems/config.tests/x11' +make[1]: Entering directory `/home1/kate/qt5/qt5-20120423/qtsystems/config.tests/x11' g++ -c -pipe -O2 -Wall -W -D_REENTRANT -fPIE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/opt/qt5/mkspecs/linux-g++ -I. -I/opt/qt5/include/QtCore -I/opt/qt5/include/QtGui -I/opt/qt5/include -I. -o main.o main.cpp g++ -Wl,-O1 -Wl,-rpath,/opt/qt5/lib -o x11 main.o -L/opt/qt5/lib -lX11 -lQtGui -L/opt/qt5/lib -lQtCore -lGL -lpthread -make[1]: Leaving directory `/home1/kate/qt5/qt5-20120402/qtsystems/config.tests/x11' +make[1]: Leaving directory `/home1/kate/qt5/qt5-20120423/qtsystems/config.tests/x11' config test "x11" completed with result 1 executing config test "bluez": + /opt/qt5/bin/qmake CONFIG-=debug_and_release CONFIG-=app_bundle + make -make[1]: Entering directory `/home1/kate/qt5/qt5-20120402/qtsystems/config.tests/bluez' +make[1]: Entering directory `/home1/kate/qt5/qt5-20120423/qtsystems/config.tests/bluez' g++ -c -pipe -O2 -Wall -W -D_REENTRANT -fPIE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/opt/qt5/mkspecs/linux-g++ -I. -I/opt/qt5/include/QtCore -I/opt/qt5/include/QtGui -I/opt/qt5/include -I. -o main.o main.cpp g++ -Wl,-O1 -Wl,-rpath,/opt/qt5/lib -o bluez main.o -L/opt/qt5/lib -lbluetooth -lQtGui -L/opt/qt5/lib -lQtCore -lGL -lpthread -make[1]: Leaving directory `/home1/kate/qt5/qt5-20120402/qtsystems/config.tests/bluez' +make[1]: Leaving directory `/home1/kate/qt5/qt5-20120423/qtsystems/config.tests/bluez' config test "bluez" completed with result 1 executing config test "mtlib": + /opt/qt5/bin/qmake CONFIG-=debug_and_release CONFIG-=app_bundle @@ -29,8 +29,8 @@ executing config test "udev": + /opt/qt5/bin/qmake CONFIG-=debug_and_release CONFIG-=app_bundle + make -make[1]: Entering directory `/home1/kate/qt5/qt5-20120402/qtsystems/config.tests/udev' +make[1]: Entering directory `/home1/kate/qt5/qt5-20120423/qtsystems/config.tests/udev' g++ -c -pipe -O2 -Wall -W -D_REENTRANT -fPIE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/opt/qt5/mkspecs/linux-g++ -I. -I/opt/qt5/include/QtCore -I/opt/qt5/include/QtGui -I/opt/qt5/include -I. -o main.o main.cpp g++ -Wl,-O1 -Wl,-rpath,/opt/qt5/lib -o udev main.o -L/opt/qt5/lib -lQtGui -L/opt/qt5/lib -lQtCore -lGL -lpthread -make[1]: Leaving directory `/home1/kate/qt5/qt5-20120402/qtsystems/config.tests/udev' +make[1]: Leaving directory `/home1/kate/qt5/qt5-20120423/qtsystems/config.tests/udev' config test "udev" completed with result 1 diff -Nru qt5-systems-0.1~git20120402/debian/changelog qt5-systems-0.1~git20120423/debian/changelog --- qt5-systems-0.1~git20120402/debian/changelog 2012-04-02 12:56:13.000000000 +0000 +++ qt5-systems-0.1~git20120423/debian/changelog 2012-04-23 12:17:50.000000000 +0000 @@ -1,3 +1,9 @@ +qt5-systems (0.1~git20120423) oneiric; urgency=low + + * git snapshot 20120423 + + -- Kate Alhola Mon, 23 Apr 2012 15:17:50 +0300 + qt5-systems (0.1~git20120402-1) oneiric; urgency=low * new git snapshot diff -Nru qt5-systems-0.1~git20120402/doc/src/serviceframework/examples/dialer.qdoc qt5-systems-0.1~git20120423/doc/src/serviceframework/examples/dialer.qdoc --- qt5-systems-0.1~git20120402/doc/src/serviceframework/examples/dialer.qdoc 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/doc/src/serviceframework/examples/dialer.qdoc 2012-04-23 11:40:00.000000000 +0000 @@ -46,7 +46,7 @@ \li servicefw dbusservice removedialerservice.xml dialer_service \endlist -These deployment commands will register the remote IPC-based service, and the Landline dialer plugign. The last +These deployment commands will register the remote IPC-based service, and the Landline dialer plugin. The last line features the ability to create an autostarting file for D-Bus if the platform supports the QtDBus module. To run the example @@ -54,8 +54,8 @@ \li dialer \endlist -The XML files for all example services can be found in the QtMobility build directory -under install/bin/xmldata. +The XML files for all example services can be found in the Qt build directory +under examples/qtsystems/serviceframework/xmldata. For Maemo and Linux platforms using D-Bus as the underlying IPC mechanism, the autostart feature can be initialised by running the service framework tool: diff -Nru qt5-systems-0.1~git20120402/doc/src/serviceframework/servicefwk.qdoc qt5-systems-0.1~git20120423/doc/src/serviceframework/servicefwk.qdoc --- qt5-systems-0.1~git20120402/doc/src/serviceframework/servicefwk.qdoc 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/doc/src/serviceframework/servicefwk.qdoc 2012-04-23 11:40:00.000000000 +0000 @@ -56,7 +56,7 @@ accessing services across multiple platforms. Due to the service frameworks knowledge of service interfaces, their -versions and QObject-based introspection it may even be used to unify and +versions, and QObject-based introspection, it may even be used to unify and access multiple platform specific service implementations via the same Qt-based client application. @@ -79,7 +79,7 @@ service's capabilities. To achieve the best level of access via the Qt meta object system services should be implemented in such a way that their entire functionality is -accessible via the signals, slots, properties or invokable functions +accessible via signals, slots, properties or invokable functions (see Q_INVOKABLE macro for more details). Each service plug-in implements one service only but can provide multiple diff -Nru qt5-systems-0.1~git20120402/.git/config qt5-systems-0.1~git20120423/.git/config --- qt5-systems-0.1~git20120402/.git/config 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/.git/config 2012-04-23 11:40:00.000000000 +0000 @@ -10,7 +10,7 @@ remote = origin merge = refs/heads/master [commit] - template = /home1/kate/qt5/qt5-20120402/qtsystems/../.commit-template + template = /home1/kate/qt5/qt5-20120423/qtsystems/../.commit-template [remote "gerrit"] url = ssh://codereview.qt-project.org/qt/qtsystems fetch = +refs/heads/*:refs/remotes/gerrit/* diff -Nru qt5-systems-0.1~git20120402/.git/HEAD qt5-systems-0.1~git20120423/.git/HEAD --- qt5-systems-0.1~git20120402/.git/HEAD 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/.git/HEAD 2012-04-23 11:45:01.000000000 +0000 @@ -1 +1 @@ -058e4ccae0a6e5fae364c90ac399f9f9b9778f94 +27b9d68455ddac087a1f3293daa23cad881c3312 Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/.git/index and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/.git/index differ diff -Nru qt5-systems-0.1~git20120402/.git/logs/HEAD qt5-systems-0.1~git20120423/.git/logs/HEAD --- qt5-systems-0.1~git20120402/.git/logs/HEAD 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/.git/logs/HEAD 2012-04-23 11:45:01.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 4230c35f87394efa88cd6768fd4b567af36292d1 Kate Alhola 1333364288 +0300 clone: from git://gitorious.org/qt/qtsystems.git -4230c35f87394efa88cd6768fd4b567af36292d1 058e4ccae0a6e5fae364c90ac399f9f9b9778f94 Kate Alhola 1333364576 +0300 checkout: moving from master to 058e4ccae0a6e5fae364c90ac399f9f9b9778f94 +0000000000000000000000000000000000000000 a03fcc03b398117342407a7aa1c34ddd7cf0793b Kate Alhola 1335181200 +0300 clone: from git://gitorious.org/qt/qtsystems.git +a03fcc03b398117342407a7aa1c34ddd7cf0793b 27b9d68455ddac087a1f3293daa23cad881c3312 Kate Alhola 1335181501 +0300 checkout: moving from master to 27b9d68455ddac087a1f3293daa23cad881c3312 diff -Nru qt5-systems-0.1~git20120402/.git/logs/refs/heads/master qt5-systems-0.1~git20120423/.git/logs/refs/heads/master --- qt5-systems-0.1~git20120402/.git/logs/refs/heads/master 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/.git/logs/refs/heads/master 2012-04-23 11:40:00.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 4230c35f87394efa88cd6768fd4b567af36292d1 Kate Alhola 1333364288 +0300 clone: from git://gitorious.org/qt/qtsystems.git +0000000000000000000000000000000000000000 a03fcc03b398117342407a7aa1c34ddd7cf0793b Kate Alhola 1335181200 +0300 clone: from git://gitorious.org/qt/qtsystems.git Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/.git/objects/pack/pack-5d6cc199fab6295cb7dcbf0e4f9ca23263bfd0d7.idx and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/.git/objects/pack/pack-5d6cc199fab6295cb7dcbf0e4f9ca23263bfd0d7.idx differ Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/.git/objects/pack/pack-5d6cc199fab6295cb7dcbf0e4f9ca23263bfd0d7.pack and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/.git/objects/pack/pack-5d6cc199fab6295cb7dcbf0e4f9ca23263bfd0d7.pack differ Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/.git/objects/pack/pack-ae0eb0b6ca18e77198b8d6c8a87ac111bd4451c1.idx and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/.git/objects/pack/pack-ae0eb0b6ca18e77198b8d6c8a87ac111bd4451c1.idx differ Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/.git/objects/pack/pack-ae0eb0b6ca18e77198b8d6c8a87ac111bd4451c1.pack and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/.git/objects/pack/pack-ae0eb0b6ca18e77198b8d6c8a87ac111bd4451c1.pack differ diff -Nru qt5-systems-0.1~git20120402/.git/packed-refs qt5-systems-0.1~git20120423/.git/packed-refs --- qt5-systems-0.1~git20120402/.git/packed-refs 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/.git/packed-refs 2012-04-23 11:40:00.000000000 +0000 @@ -1,2 +1,4 @@ # pack-refs with: peeled -4230c35f87394efa88cd6768fd4b567af36292d1 refs/remotes/origin/master +427c4b98094b64c52e6eb621df1b467e2b59ddc4 refs/tags/qt-v5.0.0-alpha1 +^4151cd3912d236c6d289308b4bd5f579e183a61c +a03fcc03b398117342407a7aa1c34ddd7cf0793b refs/remotes/origin/master diff -Nru qt5-systems-0.1~git20120402/.git/refs/heads/master qt5-systems-0.1~git20120423/.git/refs/heads/master --- qt5-systems-0.1~git20120402/.git/refs/heads/master 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/.git/refs/heads/master 2012-04-23 11:40:00.000000000 +0000 @@ -1 +1 @@ -4230c35f87394efa88cd6768fd4b567af36292d1 +a03fcc03b398117342407a7aa1c34ddd7cf0793b Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/imports/QtPublishSubscribe/libdeclarative_publishsubscribe.so and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/imports/QtPublishSubscribe/libdeclarative_publishsubscribe.so differ Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/imports/QtServiceFramework/libdeclarative_serviceframework.so and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/imports/QtServiceFramework/libdeclarative_serviceframework.so differ Binary files /tmp/iJrc1qvW0F/qt5-systems-0.1~git20120402/imports/QtSystemInfo/libdeclarative_systeminfo.so and /tmp/Gj1KmW_1UM/qt5-systems-0.1~git20120423/imports/QtSystemInfo/libdeclarative_systeminfo.so differ diff -Nru qt5-systems-0.1~git20120402/lib/libQtPublishSubscribe.la qt5-systems-0.1~git20120423/lib/libQtPublishSubscribe.la --- qt5-systems-0.1~git20120402/lib/libQtPublishSubscribe.la 2012-04-02 12:56:25.000000000 +0000 +++ qt5-systems-0.1~git20120423/lib/libQtPublishSubscribe.la 2012-04-24 07:33:30.000000000 +0000 @@ -1,5 +1,5 @@ # libQtPublishSubscribe.la - a libtool library file -# Generated by qmake/libtool (2.01a) (Qt 5.0.0) on: Mon Apr 2 15:56:25 2012 +# Generated by qmake/libtool (2.01a) (Qt 5.0.0) on: Tue Apr 24 10:33:30 2012 # The name that we can dlopen(3). dlname='libQtPublishSubscribe.so.5' diff -Nru qt5-systems-0.1~git20120402/lib/libQtPublishSubscribe.prl qt5-systems-0.1~git20120423/lib/libQtPublishSubscribe.prl --- qt5-systems-0.1~git20120402/lib/libQtPublishSubscribe.prl 2012-04-02 12:56:25.000000000 +0000 +++ qt5-systems-0.1~git20120423/lib/libQtPublishSubscribe.prl 2012-04-24 07:33:30.000000000 +0000 @@ -1,4 +1,4 @@ -QMAKE_PRL_BUILD_DIR = /home1/kate/qt5/qt5-20120402/qtsystems/src/publishsubscribe/ +QMAKE_PRL_BUILD_DIR = /home1/kate/qt5/qt5-20120423/qtsystems/src/publishsubscribe/ QMAKE_PRO_INPUT = publishsubscribe.pro QMAKE_PRL_TARGET = libQtPublishSubscribe.so.5.0.0 QMAKE_PRL_DEFINES = QT_SHARED diff -Nru qt5-systems-0.1~git20120402/lib/libQtServiceFramework.la qt5-systems-0.1~git20120423/lib/libQtServiceFramework.la --- qt5-systems-0.1~git20120402/lib/libQtServiceFramework.la 2012-04-02 12:56:32.000000000 +0000 +++ qt5-systems-0.1~git20120423/lib/libQtServiceFramework.la 2012-04-24 07:33:37.000000000 +0000 @@ -1,5 +1,5 @@ # libQtServiceFramework.la - a libtool library file -# Generated by qmake/libtool (2.01a) (Qt 5.0.0) on: Mon Apr 2 15:56:32 2012 +# Generated by qmake/libtool (2.01a) (Qt 5.0.0) on: Tue Apr 24 10:33:37 2012 # The name that we can dlopen(3). dlname='libQtServiceFramework.so.5' diff -Nru qt5-systems-0.1~git20120402/lib/libQtServiceFramework.prl qt5-systems-0.1~git20120423/lib/libQtServiceFramework.prl --- qt5-systems-0.1~git20120402/lib/libQtServiceFramework.prl 2012-04-02 12:56:32.000000000 +0000 +++ qt5-systems-0.1~git20120423/lib/libQtServiceFramework.prl 2012-04-24 07:33:37.000000000 +0000 @@ -1,4 +1,4 @@ -QMAKE_PRL_BUILD_DIR = /home1/kate/qt5/qt5-20120402/qtsystems/src/serviceframework/ +QMAKE_PRL_BUILD_DIR = /home1/kate/qt5/qt5-20120423/qtsystems/src/serviceframework/ QMAKE_PRO_INPUT = serviceframework.pro QMAKE_PRL_TARGET = libQtServiceFramework.so.5.0.0 QMAKE_PRL_DEFINES = QT_SHARED diff -Nru qt5-systems-0.1~git20120402/lib/libQtSystemInfo.la qt5-systems-0.1~git20120423/lib/libQtSystemInfo.la --- qt5-systems-0.1~git20120402/lib/libQtSystemInfo.la 2012-04-02 12:57:06.000000000 +0000 +++ qt5-systems-0.1~git20120423/lib/libQtSystemInfo.la 2012-04-24 07:34:13.000000000 +0000 @@ -1,5 +1,5 @@ # libQtSystemInfo.la - a libtool library file -# Generated by qmake/libtool (2.01a) (Qt 5.0.0) on: Mon Apr 2 15:57:06 2012 +# Generated by qmake/libtool (2.01a) (Qt 5.0.0) on: Tue Apr 24 10:34:13 2012 # The name that we can dlopen(3). dlname='libQtSystemInfo.so.5' diff -Nru qt5-systems-0.1~git20120402/lib/libQtSystemInfo.prl qt5-systems-0.1~git20120423/lib/libQtSystemInfo.prl --- qt5-systems-0.1~git20120402/lib/libQtSystemInfo.prl 2012-04-02 12:57:06.000000000 +0000 +++ qt5-systems-0.1~git20120423/lib/libQtSystemInfo.prl 2012-04-24 07:34:13.000000000 +0000 @@ -1,4 +1,4 @@ -QMAKE_PRL_BUILD_DIR = /home1/kate/qt5/qt5-20120402/qtsystems/src/systeminfo/ +QMAKE_PRL_BUILD_DIR = /home1/kate/qt5/qt5-20120423/qtsystems/src/systeminfo/ QMAKE_PRO_INPUT = systeminfo.pro QMAKE_PRL_TARGET = libQtSystemInfo.so.5.0.0 QMAKE_PRL_DEFINES = QT_SHARED diff -Nru qt5-systems-0.1~git20120402/module-paths/modules/qt_publishsubscribe.pri qt5-systems-0.1~git20120423/module-paths/modules/qt_publishsubscribe.pri --- qt5-systems-0.1~git20120402/module-paths/modules/qt_publishsubscribe.pri 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/module-paths/modules/qt_publishsubscribe.pri 2012-04-23 11:40:00.000000000 +0000 @@ -1,7 +1,7 @@ -QT_MODULE_BASE = /home1/kate/qt5/qt5-20120402/qtsystems -QT_MODULE_BIN_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/bin -QT_MODULE_INCLUDE_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/include -QT_MODULE_IMPORT_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/imports -QT_MODULE_LIB_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/lib -QT_MODULE_PLUGIN_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/plugins -include(/home1/kate/qt5/qt5-20120402/qtsystems/modules/qt_publishsubscribe.pri) +QT_MODULE_BASE = /home1/kate/qt5/qt5-20120423/qtsystems +QT_MODULE_BIN_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/bin +QT_MODULE_INCLUDE_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/include +QT_MODULE_IMPORT_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/imports +QT_MODULE_LIB_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/lib +QT_MODULE_PLUGIN_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/plugins +include(/home1/kate/qt5/qt5-20120423/qtsystems/modules/qt_publishsubscribe.pri) diff -Nru qt5-systems-0.1~git20120402/module-paths/modules/qt_serviceframework.pri qt5-systems-0.1~git20120423/module-paths/modules/qt_serviceframework.pri --- qt5-systems-0.1~git20120402/module-paths/modules/qt_serviceframework.pri 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/module-paths/modules/qt_serviceframework.pri 2012-04-23 11:40:00.000000000 +0000 @@ -1,7 +1,7 @@ -QT_MODULE_BASE = /home1/kate/qt5/qt5-20120402/qtsystems -QT_MODULE_BIN_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/bin -QT_MODULE_INCLUDE_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/include -QT_MODULE_IMPORT_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/imports -QT_MODULE_LIB_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/lib -QT_MODULE_PLUGIN_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/plugins -include(/home1/kate/qt5/qt5-20120402/qtsystems/modules/qt_serviceframework.pri) +QT_MODULE_BASE = /home1/kate/qt5/qt5-20120423/qtsystems +QT_MODULE_BIN_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/bin +QT_MODULE_INCLUDE_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/include +QT_MODULE_IMPORT_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/imports +QT_MODULE_LIB_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/lib +QT_MODULE_PLUGIN_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/plugins +include(/home1/kate/qt5/qt5-20120423/qtsystems/modules/qt_serviceframework.pri) diff -Nru qt5-systems-0.1~git20120402/module-paths/modules/qt_systeminfo.pri qt5-systems-0.1~git20120423/module-paths/modules/qt_systeminfo.pri --- qt5-systems-0.1~git20120402/module-paths/modules/qt_systeminfo.pri 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/module-paths/modules/qt_systeminfo.pri 2012-04-23 11:40:00.000000000 +0000 @@ -1,7 +1,7 @@ -QT_MODULE_BASE = /home1/kate/qt5/qt5-20120402/qtsystems -QT_MODULE_BIN_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/bin -QT_MODULE_INCLUDE_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/include -QT_MODULE_IMPORT_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/imports -QT_MODULE_LIB_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/lib -QT_MODULE_PLUGIN_BASE = /home1/kate/qt5/qt5-20120402/qtsystems/plugins -include(/home1/kate/qt5/qt5-20120402/qtsystems/modules/qt_systeminfo.pri) +QT_MODULE_BASE = /home1/kate/qt5/qt5-20120423/qtsystems +QT_MODULE_BIN_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/bin +QT_MODULE_INCLUDE_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/include +QT_MODULE_IMPORT_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/imports +QT_MODULE_LIB_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/lib +QT_MODULE_PLUGIN_BASE = /home1/kate/qt5/qt5-20120423/qtsystems/plugins +include(/home1/kate/qt5/qt5-20120423/qtsystems/modules/qt_systeminfo.pri) diff -Nru qt5-systems-0.1~git20120402/src/publishsubscribe/jsondblayer.cpp qt5-systems-0.1~git20120423/src/publishsubscribe/jsondblayer.cpp --- qt5-systems-0.1~git20120402/src/publishsubscribe/jsondblayer.cpp 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/src/publishsubscribe/jsondblayer.cpp 2012-04-23 11:45:01.000000000 +0000 @@ -44,7 +44,6 @@ #include "jsondblayer_p.h" #include -#include #include #include #include @@ -138,7 +137,25 @@ JsonDbSyncCall::JsonDbSyncCall(const QString &query, QList *result): - mQuery(query), mResult(result), mConnection(NULL), mRequest(NULL) + mQuery(query), + mObject(NULL), + mResult(result), + mSuccess(false), + mConnection(NULL), + mReadRequest(NULL), + mUpdateRequest(NULL) +{ + startTimer(WAIT_FOR_THREAD_TIMEOUT); +} + +JsonDbSyncCall::JsonDbSyncCall(const QJsonObject *object): + mQuery(QStringLiteral("")), + mObject(object), + mResult(NULL), + mSuccess(false), + mConnection(NULL), + mReadRequest(NULL), + mUpdateRequest(NULL) { startTimer(WAIT_FOR_THREAD_TIMEOUT); } @@ -147,8 +164,11 @@ { DEBUG_SIGNATURE - if (mRequest) - delete mRequest; + if (mReadRequest) + delete mReadRequest; + + if (mUpdateRequest) + delete mUpdateRequest; if (mConnection) delete mConnection; @@ -161,35 +181,57 @@ QThread::currentThread()->quit(); } -void JsonDbSyncCall::createSyncRequest() +void JsonDbSyncCall::createSyncReadRequest() { DEBUG_SIGNATURE mConnection = new QtJsonDb::QJsonDbConnection; mConnection->connectToServer(); - mRequest = new QtJsonDb::QJsonDbReadRequest; + mReadRequest = new QtJsonDb::QJsonDbReadRequest; - mRequest->setQuery(mQuery); + mReadRequest->setQuery(mQuery); - connect(mRequest, + connect(mReadRequest, SIGNAL(resultsAvailable(int)), this, SLOT(handleResponse(int))); - connect(mRequest, + connect(mReadRequest, + SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), + this, + SLOT(handleError(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); + + mConnection->send(mReadRequest); +} + +void JsonDbSyncCall::createSyncUpdateRequest() +{ + DEBUG_SIGNATURE + + mConnection = new QtJsonDb::QJsonDbConnection; + mConnection->connectToServer(); + + mUpdateRequest = new QtJsonDb::QJsonDbUpdateRequest(*mObject); + + connect(mUpdateRequest, + SIGNAL(finished()), + this, + SLOT(handleFinished())); + + connect(mUpdateRequest, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), this, SLOT(handleError(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); - mConnection->send(mRequest); + mConnection->send(mUpdateRequest); } void JsonDbSyncCall::handleResponse(int) { DEBUG_SIGNATURE - *mResult = mRequest->takeResults(); + *mResult = mReadRequest->takeResults(); QThread::currentThread()->quit(); } @@ -198,9 +240,24 @@ { DEBUG_SIGNATURE + mSuccess = false; + QThread::currentThread()->quit(); } +void JsonDbSyncCall::handleFinished() +{ + DEBUG_SIGNATURE + + mSuccess = true; + + QThread::currentThread()->quit(); +} + +bool JsonDbSyncCall::wasSuccessful() const +{ + return mSuccess; +} JsonDbHandle::JsonDbHandle( JsonDbHandle *parent, @@ -274,31 +331,29 @@ settings[parts[1]] = QJsonValue::fromVariant(data); updateObject[QStringLiteral("settings")] = settings; - doUpdateRequest(updateObject); - - return true; + return doUpdateRequest(updateObject); } -void JsonDbHandle::doUpdateRequest(const QJsonObject &updateObject) +bool JsonDbHandle::doUpdateRequest(const QJsonObject &updateObject) { - if (!client) { - client = new QtJsonDb::QJsonDbConnection(); - client->connectToServer(); - } + QThread syncThread; + JsonDbSyncCall *call = new JsonDbSyncCall(&updateObject); - QtJsonDb::QJsonDbUpdateRequest* mRequest = new QtJsonDb::QJsonDbUpdateRequest(updateObject); + connect(&syncThread, + SIGNAL(started()), + call, + SLOT(createSyncUpdateRequest())); - connect(mRequest, - SIGNAL(finished()), - mRequest, - SLOT(deleteLater())); + call->moveToThread(&syncThread); - connect(mRequest, - SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), - mRequest, - SLOT(deleteLater())); + syncThread.start(); + syncThread.wait(); - client->send(mRequest); + bool success = call->wasSuccessful(); + + call->deleteLater(); + + return success; } QJsonObject JsonDbHandle::getObject(const QString &identifier, const QString &property) @@ -328,7 +383,7 @@ connect(&syncThread, SIGNAL(started()), call, - SLOT(createSyncRequest())); + SLOT(createSyncReadRequest())); connect(&syncThread, SIGNAL(finished()), @@ -377,7 +432,7 @@ QtJsonDb::QJsonDbWatcher::Actions actions; getNotificationQueryAndActions(getWholePath(QStringLiteral("")), query, actions); - DEBUG_MSG(query) + if (!client) { client = new QtJsonDb::QJsonDbConnection(); client->connectToServer(); diff -Nru qt5-systems-0.1~git20120402/src/publishsubscribe/jsondblayer_p.h qt5-systems-0.1~git20120423/src/publishsubscribe/jsondblayer_p.h --- qt5-systems-0.1~git20120402/src/publishsubscribe/jsondblayer_p.h 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/src/publishsubscribe/jsondblayer_p.h 2012-04-23 11:45:01.000000000 +0000 @@ -60,6 +60,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE @@ -105,18 +106,28 @@ public: JsonDbSyncCall(const QString &query, QList *result); + JsonDbSyncCall(const QJsonObject *object); ~JsonDbSyncCall(); + bool wasSuccessful() const; + public slots: - void createSyncRequest(); + void createSyncReadRequest(); + void createSyncUpdateRequest(); + + private slots: void handleResponse(int id); + void handleFinished(); void handleError(QtJsonDb::QJsonDbRequest::ErrorCode id, QString code); private: const QString &mQuery; + const QJsonObject *mObject; QList *mResult; + bool mSuccess; QtJsonDb::QJsonDbConnection *mConnection; - QtJsonDb::QJsonDbReadRequest *mRequest; + QtJsonDb::QJsonDbReadRequest *mReadRequest; + QtJsonDb::QJsonDbUpdateRequest *mUpdateRequest; void timerEvent(QTimerEvent *event); }; @@ -205,7 +216,7 @@ void getNotificationQueryAndActions(QString path, QString &query, QtJsonDb::QJsonDbWatcher::Actions &actions); - void doUpdateRequest(const QJsonObject&); + bool doUpdateRequest(const QJsonObject&); }; diff -Nru qt5-systems-0.1~git20120402/src/systeminfo/qjsondbwrapper.cpp qt5-systems-0.1~git20120423/src/systeminfo/qjsondbwrapper.cpp --- qt5-systems-0.1~git20120402/src/systeminfo/qjsondbwrapper.cpp 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/src/systeminfo/qjsondbwrapper.cpp 2012-04-23 11:45:01.000000000 +0000 @@ -142,9 +142,11 @@ return -1; } -QJsonValue QJsonDbWrapper::getSystemPropertyValue(const QString &objectType, const QString &property) +QJsonValue QJsonDbWrapper::getSystemPropertyValue(const QString &objectType, const QString &property, const QString &partition) { QJsonDbReadRequest request; + if (!partition.isEmpty()) + request.setPartition(partition); request.setQuery(QString(QStringLiteral("[?_type=\"com.nokia.mt.system.%1\"]")).arg(objectType)); connect(&request, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), this, SLOT(onJsonDbRequestError(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); @@ -160,9 +162,11 @@ return QJsonValue(); } -QJsonValue QJsonDbWrapper::getSystemSettingValue(const QString &settingId, const QString &setting) +QJsonValue QJsonDbWrapper::getSystemSettingValue(const QString &settingId, const QString &setting, const QString &partition) { QJsonDbReadRequest request; + if (!partition.isEmpty()) + request.setPartition(partition); request.setQuery(QString(QStringLiteral("[?_type=\"com.nokia.mt.settings.SystemSettings\"][?identifier=\"com.nokia.mt.settings.%1\"][={settings:settings}]")) .arg(settingId)); connect(&request, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), diff -Nru qt5-systems-0.1~git20120402/src/systeminfo/qjsondbwrapper_p.h qt5-systems-0.1~git20120423/src/systeminfo/qjsondbwrapper_p.h --- qt5-systems-0.1~git20120402/src/systeminfo/qjsondbwrapper_p.h 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/src/systeminfo/qjsondbwrapper_p.h 2012-04-23 11:45:01.000000000 +0000 @@ -96,8 +96,8 @@ void onJsonDbWatcherNotificationsAvailable(); private: - QJsonValue getSystemPropertyValue(const QString &objectType, const QString &property); - QJsonValue getSystemSettingValue(const QString &settingId, const QString &setting); + QJsonValue getSystemPropertyValue(const QString &objectType, const QString &property, const QString &partition = QStringLiteral("")); + QJsonValue getSystemSettingValue(const QString &settingId, const QString &setting, const QString &partition = QStringLiteral("")); bool hasSystemObject(const QString &objectType); bool waitForResponse(); diff -Nru qt5-systems-0.1~git20120402/tests/auto/publishsubscribe/qvaluespace_jsondb/qvaluespace_jsondb.pro qt5-systems-0.1~git20120423/tests/auto/publishsubscribe/qvaluespace_jsondb/qvaluespace_jsondb.pro --- qt5-systems-0.1~git20120402/tests/auto/publishsubscribe/qvaluespace_jsondb/qvaluespace_jsondb.pro 2012-04-02 10:58:08.000000000 +0000 +++ qt5-systems-0.1~git20120423/tests/auto/publishsubscribe/qvaluespace_jsondb/qvaluespace_jsondb.pro 2012-04-23 11:40:00.000000000 +0000 @@ -8,6 +8,7 @@ QT += jsondb QT += publishsubscribe QT += core-private +QT += concurrent TARGET = tst_testpublishsubscribe target.path = /usr/bin diff -Nru qt5-systems-0.1~git20120402/tests/auto/publishsubscribe/qvaluespace_jsondb/tst_valuespace_jsondb.cpp qt5-systems-0.1~git20120423/tests/auto/publishsubscribe/qvaluespace_jsondb/tst_valuespace_jsondb.cpp --- qt5-systems-0.1~git20120402/tests/auto/publishsubscribe/qvaluespace_jsondb/tst_valuespace_jsondb.cpp 2012-04-02 11:02:56.000000000 +0000 +++ qt5-systems-0.1~git20120423/tests/auto/publishsubscribe/qvaluespace_jsondb/tst_valuespace_jsondb.cpp 2012-04-23 11:40:00.000000000 +0000 @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include "qvaluespacepublisher.h" #include "qvaluespacesubscriber.h" @@ -56,7 +58,9 @@ #include #include -#define WAIT_FOR 60 +Q_DECLARE_METATYPE(QtJsonDb::QJsonDbRequest::ErrorCode) + +const int WAIT_FOR = 60; class JsonDbHandler: QObject { @@ -68,8 +72,6 @@ void cleanupJsonDb(); void createJsonObjects(const QStringList &objects); - QVariantMap getObject(const QString &identifier); - bool exists(QString query); private slots: void successSlot(int id); @@ -78,17 +80,16 @@ private: QtJsonDb::QJsonDbConnection *mConnection; QList result; - bool finished; - void wait(); + void wait(QtJsonDb::QJsonDbRequest &); }; JsonDbHandler::JsonDbHandler() { + qRegisterMetaType(); + mConnection = new QtJsonDb::QJsonDbConnection; mConnection->connectToServer(); - - finished = false; } JsonDbHandler::~JsonDbHandler() @@ -99,29 +100,17 @@ void JsonDbHandler::successSlot(int) { result = ((QtJsonDb::QJsonDbReadRequest*)sender())->takeResults(); - - finished = true; } -void JsonDbHandler::errorSlot(QtJsonDb::QJsonDbRequest::ErrorCode, QString) +void JsonDbHandler::errorSlot(QtJsonDb::QJsonDbRequest::ErrorCode, QString errorMessage) { - result = QList(); + qDebug()<<"ERROR:"<(); } -void JsonDbHandler::cleanupJsonDb() +void JsonDbHandler::wait(QtJsonDb::QJsonDbRequest &request) { - QtJsonDb::QJsonDbReadRequest request; - request.setQuery("[?identifier~=\"/com.pstest/\"]"); connect(&request, SIGNAL(resultsAvailable(int)), @@ -133,83 +122,45 @@ this, SLOT(errorSlot(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); - mConnection->send(&request); - - wait(); + QSignalSpy successSpy(&request, SIGNAL(resultsAvailable(int))); + QSignalSpy errorSpy(&request, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); - QtJsonDb::QJsonDbRemoveRequest rmRequest(result); + QVERIFY(successSpy.isValid()); + QVERIFY(errorSpy.isValid()); - mConnection->send(&rmRequest); + mConnection->send(&request); - QTest::qWait(WAIT_FOR); -} + for (int i = 0; i < 500; i++) { + if (successSpy.count() > 0 || errorSpy.count() > 0) + return; -void JsonDbHandler::createJsonObjects(const QStringList &objectsStr) -{ - QList objects; - - foreach (QString object, objectsStr) { - objects.append(QJsonDocument::fromJson(QByteArray(object.toStdString().c_str())).object()); + QTest::qWait(1); } - - QtJsonDb::QJsonDbCreateRequest request(objects); - - connect(&request, SIGNAL(resultsAvailable(int)), this, SLOT(successSlot(int))); - - connect(&request, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), - this, SLOT(errorSlot(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); - - mConnection->send(&request); - - QTest::qWait(WAIT_FOR); } -bool JsonDbHandler::exists(QString query) +void JsonDbHandler::cleanupJsonDb() { - QtJsonDb::QJsonDbReadRequest* mRequest = new QtJsonDb::QJsonDbReadRequest; - mRequest->setQuery(query); - - connect(mRequest, SIGNAL(resultsAvailable(int)), this, SLOT(successSlot(int))); - - connect(mRequest, SIGNAL(finished()), mRequest, SLOT(deleteLater())); - - connect(mRequest, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), - this, SLOT(errorSlot(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); - - connect(mRequest, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), - mRequest, SLOT(deleteLater())); + QtJsonDb::QJsonDbReadRequest request; + request.setQuery("[?identifier~=\"/com.pstest/\"]"); - mConnection->send(mRequest); + wait(request); - wait(); + QtJsonDb::QJsonDbRemoveRequest rmRequest(result); - return result.count() > 0; + wait(rmRequest); } -QVariantMap JsonDbHandler::getObject(const QString &identifier) +void JsonDbHandler::createJsonObjects(const QStringList &objectsStr) { - QtJsonDb::QJsonDbReadRequest* mRequest = new QtJsonDb::QJsonDbReadRequest; - mRequest->setQuery(QString("[?identifier=\"%1\"]").arg(identifier)); - - connect(mRequest, SIGNAL(resultsAvailable(int)), this, SLOT(successSlot(int))); - - connect(mRequest, SIGNAL(finished()), mRequest, SLOT(deleteLater())); - - connect(mRequest, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), - this, SLOT(errorSlot(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); - - connect(mRequest, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), - mRequest, SLOT(deleteLater())); - - mConnection->send(mRequest); - - wait(); + QList objects; - if (result.count() == 0) { - return QVariantMap(); + foreach (QString object, objectsStr) { + objects.append(QJsonDocument::fromJson(QByteArray(object.toStdString().c_str())).object()); } - return result.at(0).toVariantMap(); + QtJsonDb::QJsonDbCreateRequest request(objects); + + wait(request); } @@ -255,6 +206,7 @@ void testHandle_JsonDbHandle(); void testHandle_Value(); void testHandle_SetValue(); + void testHandle_SetValueConcurrent(); void testHandle_UnsetValue(); void testHandle_Subscribe(); void testHandle_Unsubscribe(); @@ -281,6 +233,8 @@ bool value; JsonDbHandler jsonDbHandler; + + int concurrentSetValue(const QString &path, const QString &name, int loops); }; TestQValueSpaceJsonDb::TestQValueSpaceJsonDb() @@ -373,14 +327,12 @@ jsonDbHandler.createJsonObjects(objects); - QTest::qWait(WAIT_FOR); QCOMPARE(spy.count(), 1); layer->notifyInterest(quintptr(&handle), false); jsonDbHandler.createJsonObjects(objects); - QTest::qWait(WAIT_FOR); QCOMPARE(spy.count(), 1); } @@ -449,14 +401,12 @@ jsonDbHandler.createJsonObjects(objects); - QTest::qWait(WAIT_FOR); QCOMPARE(spy.count(), 1); layer->setProperty(quintptr(&handle), (QAbstractValueSpaceLayer::Properties)0); jsonDbHandler.createJsonObjects(objects); - QTest::qWait(WAIT_FOR); QCOMPARE(spy.count(), 1); } @@ -787,6 +737,56 @@ QVERIFY2(!handle4.setValue("", 42), "setValue() failed!"); } +void TestQValueSpaceJsonDb::testHandle_SetValueConcurrent() +{ + QStringList objects; + objects<<"{\"_type\":\"com.nokia.mt.settings.ApplicationSettings\", \"identifier\":\"com.pstest.testSetValueConcurrent\", \"settings\": {\"setting1\":0, \"setting2\":0}}"; + jsonDbHandler.createJsonObjects(objects); + + int loops = 500; + QString path = "/com/pstest/testSetValueConcurrent"; + + QFuture f1 = QtConcurrent::run(this, + &TestQValueSpaceJsonDb::concurrentSetValue, + path, + QString("setting1"), + loops); + + QFuture f2 = QtConcurrent::run(this, + &TestQValueSpaceJsonDb::concurrentSetValue, + path, + QString("setting2"), + loops); + + f1.waitForFinished(); + f2.waitForFinished(); + + // TODO + QSKIP("Test disabled until JSON DB activates stale updates by default!"); + QVERIFY2(f1.result() == loops, QString::number(f1.result()).toStdString().c_str()); + QVERIFY2(f2.result() == loops, QString::number(f2.result()).toStdString().c_str()); +} + +int TestQValueSpaceJsonDb::concurrentSetValue(const QString &path, const QString &name, int loops) +{ + JsonDbHandle handle(NULL, path, QValueSpace::PermanentLayer | QValueSpace::WritableLayer); + + for (int i = 0; i < loops; i++) { + while (!handle.setValue(name, i + 1)) { + qDebug()<<"handle.setValue() failed"; + } + } + + QTest::qWait(WAIT_FOR); + + QVariant var; + if (!handle.value(name, &var)) { + return -1; + } + + return var.toInt(); +} + void TestQValueSpaceJsonDb::testHandle_UnsetValue() { QStringList objects; @@ -826,7 +826,6 @@ jsonDbHandler.createJsonObjects(objects); - QTest::qWait(500);//WAIT_FOR); QCOMPARE(spy.count(), 1); } @@ -849,8 +848,6 @@ jsonDbHandler.createJsonObjects(objects); - QTest::qWait(WAIT_FOR); - QCOMPARE(spy.count(), 0); } @@ -1075,17 +1072,17 @@ void TestQValueSpaceJsonDb::testAPI_MultipleWrites() { QStringList objects; - objects<