Merge branch 'master' into bugfix_126195

23 files changed, 118 insertions, 94 deletions

diff --git a/.gitignore b/.gitignore
index 4f1ac406..878abf05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,3 @@ lcov.info
 INSTALL
 build-stamp
 flexi-properties.xml
-/libcontextsubscriber/multithreading-tests/new-property-in-thread/new-property-in-thread
-/libcontextsubscriber/multithreading-tests/old-property-in-thread/old-property-in-thread
-/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/wait-for-subscription-thread
-/libcontextsubscriber/multithreading-tests/single-thread/single-thread
diff --git a/configure.ac b/configure.ac
index 6531d9d5..8a25723e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,13 @@ AC_CONFIG_FILES([
         libcontextsubscriber/unit-tests/propertyhandle/Makefile
         libcontextsubscriber/unit-tests/propertyprovider/Makefile
         libcontextsubscriber/unit-tests/util/Makefile
+        libcontextsubscriber/multithreading-tests/Makefile
+        libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile
+        libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile
+        libcontextsubscriber/multithreading-tests/single-thread/Makefile
+        libcontextsubscriber/multithreading-tests/stress-test/Makefile
+        libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile
+        libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile
         libcontextsubscriber/update-contextkit-providers/Makefile
         python/Makefile
         spec/Makefile
diff --git a/libcontextsubscriber/Makefile.am b/libcontextsubscriber/Makefile.am
index d68221ba..14d595a4 100644
--- a/libcontextsubscriber/Makefile.am
+++ b/libcontextsubscriber/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src unit-tests customer-tests cli update-contextkit-providers doc man
+SUBDIRS = src unit-tests customer-tests multithreading-tests cli update-contextkit-providers doc man
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = contextsubscriber-1.0.pc
diff --git a/libcontextsubscriber/multithreading-tests/Makefile.am b/libcontextsubscriber/multithreading-tests/Makefile.am
new file mode 100644
index 00000000..a42995ff
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = new-property-in-thread old-property-in-thread single-thread stress-test wait-for-subscription-only-in-thread wait-for-subscription-thread
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/.gitignore b/libcontextsubscriber/multithreading-tests/new-property-in-thread/.gitignore
new file mode 100644
index 00000000..4390dc85
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/new-property-in-thread/.gitignore
@@ -0,0 +1 @@
+run-test
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile.am b/libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile.am
new file mode 100644
index 00000000..6e80e6d8
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile.am
@@ -0,0 +1,17 @@
+noinst_PROGRAMS = run-test
+run_test_SOURCES = main.cpp thread.h
+
+AM_CXXFLAGS = $(QtCore_CFLAGS)
+LIBS += $(QtCore_LIBS)
+
+# library dependency hack for seamless make in cli/
+AM_CXXFLAGS += -I$(srcdir)/../../src
+run_test_LDADD = ../../src/libcontextsubscriber.la
+../../src/libcontextsubscriber.la:
+	$(MAKE) -C ../../src libcontextsubscriber.la
+.PHONY: ../../src/libcontextsubscriber.la
+
+# moccing
+nodist_run_test_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(run_test_SOURCES))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/new-property-in-thread.pro b/libcontextsubscriber/multithreading-tests/new-property-in-thread/new-property-in-thread.pro
deleted file mode 100644
index 439b35ba..00000000
--- a/libcontextsubscriber/multithreading-tests/new-property-in-thread/new-property-in-thread.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Jun 11 10:45:19 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src
-LIBS += ../../src/.libs/libcontextsubscriber.a -lcdb
-CONFIG += qxml qdbus
-
-# Input
-HEADERS += thread.h
-SOURCES += main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/.gitignore b/libcontextsubscriber/multithreading-tests/old-property-in-thread/.gitignore
new file mode 100644
index 00000000..4390dc85
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/old-property-in-thread/.gitignore
@@ -0,0 +1 @@
+run-test
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile.am b/libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile.am
new file mode 100644
index 00000000..6e80e6d8
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile.am
@@ -0,0 +1,17 @@
+noinst_PROGRAMS = run-test
+run_test_SOURCES = main.cpp thread.h
+
+AM_CXXFLAGS = $(QtCore_CFLAGS)
+LIBS += $(QtCore_LIBS)
+
+# library dependency hack for seamless make in cli/
+AM_CXXFLAGS += -I$(srcdir)/../../src
+run_test_LDADD = ../../src/libcontextsubscriber.la
+../../src/libcontextsubscriber.la:
+	$(MAKE) -C ../../src libcontextsubscriber.la
+.PHONY: ../../src/libcontextsubscriber.la
+
+# moccing
+nodist_run_test_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(run_test_SOURCES))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/old-property-in-thread.pro b/libcontextsubscriber/multithreading-tests/old-property-in-thread/old-property-in-thread.pro
deleted file mode 100644
index 439b35ba..00000000
--- a/libcontextsubscriber/multithreading-tests/old-property-in-thread/old-property-in-thread.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Jun 11 10:45:19 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src
-LIBS += ../../src/.libs/libcontextsubscriber.a -lcdb
-CONFIG += qxml qdbus
-
-# Input
-HEADERS += thread.h
-SOURCES += main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/.gitignore b/libcontextsubscriber/multithreading-tests/single-thread/.gitignore
new file mode 100644
index 00000000..4390dc85
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/single-thread/.gitignore
@@ -0,0 +1 @@
+run-test
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/Makefile.am b/libcontextsubscriber/multithreading-tests/single-thread/Makefile.am
new file mode 100644
index 00000000..3cec50b8
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/single-thread/Makefile.am
@@ -0,0 +1,17 @@
+noinst_PROGRAMS = run-test
+run_test_SOURCES = main.cpp listener.h
+
+AM_CXXFLAGS = $(QtCore_CFLAGS)
+LIBS += $(QtCore_LIBS)
+
+# library dependency hack for seamless make in cli/
+AM_CXXFLAGS += -I$(srcdir)/../../src
+run_test_LDADD = ../../src/libcontextsubscriber.la
+../../src/libcontextsubscriber.la:
+	$(MAKE) -C ../../src libcontextsubscriber.la
+.PHONY: ../../src/libcontextsubscriber.la
+
+# moccing
+nodist_run_test_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(run_test_SOURCES))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/single-thread.pro b/libcontextsubscriber/multithreading-tests/single-thread/single-thread.pro
deleted file mode 100644
index d4a31b23..00000000
--- a/libcontextsubscriber/multithreading-tests/single-thread/single-thread.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Jun 11 10:45:19 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src
-LIBS += ../../src/.libs/libcontextsubscriber.a -lcdb
-CONFIG += qxml qdbus
-
-# Input
-HEADERS += listener.h
-SOURCES += main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/.gitignore b/libcontextsubscriber/multithreading-tests/stress-test/.gitignore
index 0196a864..e08dedad 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/.gitignore
+++ b/libcontextsubscriber/multithreading-tests/stress-test/.gitignore
@@ -1,4 +1,2 @@
-stress-test
-moc_*
-*.o
+run-test
 cache.cdb
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/Makefile.am b/libcontextsubscriber/multithreading-tests/stress-test/Makefile.am
new file mode 100644
index 00000000..6e80e6d8
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/stress-test/Makefile.am
@@ -0,0 +1,17 @@
+noinst_PROGRAMS = run-test
+run_test_SOURCES = main.cpp thread.h
+
+AM_CXXFLAGS = $(QtCore_CFLAGS)
+LIBS += $(QtCore_LIBS)
+
+# library dependency hack for seamless make in cli/
+AM_CXXFLAGS += -I$(srcdir)/../../src
+run_test_LDADD = ../../src/libcontextsubscriber.la
+../../src/libcontextsubscriber.la:
+	$(MAKE) -C ../../src libcontextsubscriber.la
+.PHONY: ../../src/libcontextsubscriber.la
+
+# moccing
+nodist_run_test_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(run_test_SOURCES))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/runme.sh b/libcontextsubscriber/multithreading-tests/stress-test/runme.sh
index ac7e0b28..a2aa73d6 100755
--- a/libcontextsubscriber/multithreading-tests/stress-test/runme.sh
+++ b/libcontextsubscriber/multithreading-tests/stress-test/runme.sh
@@ -11,4 +11,4 @@
 #xterm -e 'rlwrap ../../../python/context-provide  my.test2.provider int test2.int 0 int test2.int2 0' &
 
 xterm -e './provider.py' &
-CONTEXT_PROVIDERS=../stress-test/ ./stress-test 3 3
+CONTEXT_PROVIDERS=../stress-test/ ./run-test 3 3
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/stress-test.pro b/libcontextsubscriber/multithreading-tests/stress-test/stress-test.pro
deleted file mode 100644
index 5e86994a..00000000
--- a/libcontextsubscriber/multithreading-tests/stress-test/stress-test.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Jun 24 14:21:24 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src
-LIBS += ../../src/.libs/libcontextsubscriber.a -lcdb
-CONFIG += qxml qdbus
-
-
-# Input
-HEADERS += thread.h
-SOURCES += main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore b/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore
new file mode 100644
index 00000000..4390dc85
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore
@@ -0,0 +1 @@
+run-test
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am b/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am
new file mode 100644
index 00000000..6e80e6d8
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am
@@ -0,0 +1,17 @@
+noinst_PROGRAMS = run-test
+run_test_SOURCES = main.cpp thread.h
+
+AM_CXXFLAGS = $(QtCore_CFLAGS)
+LIBS += $(QtCore_LIBS)
+
+# library dependency hack for seamless make in cli/
+AM_CXXFLAGS += -I$(srcdir)/../../src
+run_test_LDADD = ../../src/libcontextsubscriber.la
+../../src/libcontextsubscriber.la:
+	$(MAKE) -C ../../src libcontextsubscriber.la
+.PHONY: ../../src/libcontextsubscriber.la
+
+# moccing
+nodist_run_test_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(run_test_SOURCES))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/wait-for-subscription-only-in-thread.pro b/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/wait-for-subscription-only-in-thread.pro
deleted file mode 100644
index 74e8d943..00000000
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/wait-for-subscription-only-in-thread.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mon Jun 15 14:13:34 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src
-LIBS += ../../src/.libs/libcontextsubscriber.a -lcdb
-CONFIG += qxml qdbus
-
-# Input
-HEADERS += thread.h
-SOURCES += main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/.gitignore b/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/.gitignore
new file mode 100644
index 00000000..4390dc85
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/.gitignore
@@ -0,0 +1 @@
+run-test
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile.am b/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile.am
new file mode 100644
index 00000000..6e80e6d8
--- /dev/null
+++ b/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile.am
@@ -0,0 +1,17 @@
+noinst_PROGRAMS = run-test
+run_test_SOURCES = main.cpp thread.h
+
+AM_CXXFLAGS = $(QtCore_CFLAGS)
+LIBS += $(QtCore_LIBS)
+
+# library dependency hack for seamless make in cli/
+AM_CXXFLAGS += -I$(srcdir)/../../src
+run_test_LDADD = ../../src/libcontextsubscriber.la
+../../src/libcontextsubscriber.la:
+	$(MAKE) -C ../../src libcontextsubscriber.la
+.PHONY: ../../src/libcontextsubscriber.la
+
+# moccing
+nodist_run_test_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(run_test_SOURCES))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/wait-for-subscription-thread.pro b/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/wait-for-subscription-thread.pro
deleted file mode 100644
index 74e8d943..00000000
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/wait-for-subscription-thread.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mon Jun 15 14:13:34 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src
-LIBS += ../../src/.libs/libcontextsubscriber.a -lcdb
-CONFIG += qxml qdbus
-
-# Input
-HEADERS += thread.h
-SOURCES += main.cpp