Build and test fixes for released Qt 5.0

Change-Id: I9ab9c56444e926d298aadfedc9913f2394837083
Reviewed-by: Chris Craig <craig@ics.com>

98 files changed, 66 insertions, 111 deletions

diff --git a/.gitignore b/.gitignore
index 7c5bae0..59465de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ src/declarative/qtaddonprocessmanagerdeclarativeversion.h
 Makefile.Debug
 Makefile.Release
 examples/plugin/lib*
+mkspecs
diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 0000000..4285ae8
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1 @@
+load(qt_build_config)
\ No newline at end of file
diff --git a/modules/qt_processmanager.pri b/modules/qt_processmanager.pri
deleted file mode 100644
index e460303..0000000
--- a/modules/qt_processmanager.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-QT.processmanager.VERSION = 1.0.0
-QT.processmanager.MAJOR_VERSION = 1
-QT.processmanager.MINOR_VERSION = 0
-QT.processmanager.PATCH_VERSION = 0
-
-QT.processmanager.name = QtAddOnProcessManager
-QT.processmanager.bins = $$QT_MODULE_BIN_BASE
-QT.processmanager.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtAddOnProcessManager
-QT.processmanager.private_includes = $$QT_MODULE_INCLUDE_BASE/QtAddOnProcessManager/$$QT.processmanager.VERSION
-QT.processmanager.sources = $$QT_MODULE_BASE/src
-QT.processmanager.libs = $$QT_MODULE_LIB_BASE
-QT.processmanager.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.processmanager.imports = $$QT_MODULE_IMPORT_BASE
-QT.processmanager.depends = core network jsonstream
-
-QT_CONFIG += processmanager
diff --git a/modules/qt_processmanagerdeclarative.pri b/modules/qt_processmanagerdeclarative.pri
deleted file mode 100644
index 7fccb38..0000000
--- a/modules/qt_processmanagerdeclarative.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-QT.processmanagerdeclarative.VERSION = 1.0.0
-QT.processmanagerdeclarative.MAJOR_VERSION = 1
-QT.processmanagerdeclarative.MINOR_VERSION = 0
-QT.processmanagerdeclarative.PATCH_VERSION = 0
-
-QT.processmanagerdeclarative.name = QtAddOnProcessManagerDeclarative
-QT.processmanagerdeclarative.bins = $$QT_MODULE_BIN_BASE
-QT.processmanagerdeclarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtAddOnProcessManagerDeclarative
-QT.processmanagerdeclarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtAddOnProcessManagerDeclarative/$$QT.processmanagerdeclarative.VERSION
-QT.processmanagerdeclarative.sources = $$QT_MODULE_BASE/src
-QT.processmanagerdeclarative.libs = $$QT_MODULE_LIB_BASE
-QT.processmanagerdeclarative.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.processmanagerdeclarative.imports = $$QT_MODULE_IMPORT_BASE
-QT.processmanagerdeclarative.depends = core network qml processmanager
-
-QT_CONFIG += processmanagerdeclarative
diff --git a/processmanager.pro b/processmanager.pro
deleted file mode 100644
index 449d083..0000000
--- a/processmanager.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS = src examples tests
-
-include(doc/doc.pri)
diff --git a/qtprocessmanager.pro b/qtprocessmanager.pro
new file mode 100644
index 0000000..58c33f2
--- /dev/null
+++ b/qtprocessmanager.pro
@@ -0,0 +1 @@
+load(qt_parts)
diff --git a/src/core/core.pro b/src/core/core.pro
deleted file mode 100644
index 0ef28b5..0000000
--- a/src/core/core.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TEMPLATE = lib
-TARGET   = $$QT.processmanager.name
-MODULE   = processmanager
-
-load(qt_module)
-load(qt_module_config)
-
-DESTDIR = $$QT.processmanager.libs
-VERSION = $$QT.processmanager.VERSION
-DEFINES += QT_ADDON_PROCESSMANAGER_LIB
-
-CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_processmanager.pri
-
-QMAKE_CXXFLAGS += -fPIC -fvisibility-inlines-hidden
-LIBS += -ldl
-
-linux*:!CONFIG(bionic): LIBS += -lcap
-
-include($$PWD/core-lib.pri)
-
-mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.processmanager.name
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
deleted file mode 100644
index 52af941..0000000
--- a/src/declarative/declarative.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = lib
-TARGET   = $$QT.processmanagerdeclarative.name
-MODULE   = processmanagerdeclarative
-
-load(qt_module)
-load(qt_module_config)
-
-DESTDIR = $$QT.processmanagerdeclarative.libs
-VERSION = $$QT.processmanagerdeclarative.VERSION
-DEFINES += QT_ADDON_PROCESSMANAGER_LIB
-
-CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_processmanagerdeclarative.pri
-
-include(declarative-lib.pri)
diff --git a/src/declarative/declarativematchdelegate.cpp b/src/processmanager-declarative/declarativematchdelegate.cpp
index 419162d..b444e68 100644
--- a/src/declarative/declarativematchdelegate.cpp
+++ b/src/processmanager-declarative/declarativematchdelegate.cpp
@@ -113,13 +113,15 @@ void DeclarativeMatchDelegate::componentComplete()
 
 bool DeclarativeMatchDelegate::matches(const ProcessInfo& info)
 {
-    if (m_script.script().isEmpty())
+    if (m_script.isEmpty())
         return false;
 
     if (!m_modelContext)
-        m_modelContext = new QQmlContext(m_script.context(), this);
+        m_modelContext = new QQmlContext(QQmlEngine::contextForObject(this), this);
+
     m_modelContext->setContextProperty(QStringLiteral("model"), (QObject *) &info);
-    QQmlExpression expr(m_modelContext, m_script.scopeObject(), m_script.script());
+
+    QQmlExpression expr(m_script, m_modelContext);
     return expr.evaluate().toBool();
 }
 
diff --git a/src/declarative/declarativematchdelegate.h b/src/processmanager-declarative/declarativematchdelegate.h
index d8ddb86..d8ddb86 100644
--- a/src/declarative/declarativematchdelegate.h
+++ b/src/processmanager-declarative/declarativematchdelegate.h
diff --git a/src/declarative/declarativeprocessmanager.cpp b/src/processmanager-declarative/declarativeprocessmanager.cpp
index 4e18d53..4025f00 100644
--- a/src/declarative/declarativeprocessmanager.cpp
+++ b/src/processmanager-declarative/declarativeprocessmanager.cpp
@@ -128,6 +128,11 @@ void DeclarativeProcessManager::registerTypes(const char *uri)
     qmlRegisterType<StandardProcessBackend>();
     qmlRegisterType<UnixProcessBackend>();
 
+    qRegisterMetaType<ProcessFrontend*>("ProcessFrontend*");
+    qRegisterMetaType<ProcessInfo*>("ProcessInfo*");
+    qRegisterMetaType<MatchDelegate*>("MatchDelegate*");
+    qRegisterMetaType<RewriteDelegate*>("RewriteDelegate*");
+
     // Non-creatable, with enum values
     qmlRegisterUncreatableType<Process>(uri, 1, 0, "Process", QStringLiteral("Don't try to make this"));
 
@@ -195,7 +200,7 @@ void DeclarativeProcessManager::append_factory(QQmlListProperty<ProcessBackendFa
 
 QQmlListProperty<ProcessBackendFactory> DeclarativeProcessManager::factories()
 {
-    return QQmlListProperty<ProcessBackendFactory>(this, NULL, append_factory);
+    return QQmlListProperty<ProcessBackendFactory>(this, NULL, append_factory, 0, 0, 0);
 }
 
 /*!
diff --git a/src/declarative/declarativeprocessmanager.h b/src/processmanager-declarative/declarativeprocessmanager.h
index 4661b0f..14c2311 100644
--- a/src/declarative/declarativeprocessmanager.h
+++ b/src/processmanager-declarative/declarativeprocessmanager.h
@@ -54,7 +54,7 @@ class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeProcessManager : public ProcessMa
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QQmlListProperty<ProcessBackendFactory> factories READ factories)
+    Q_PROPERTY(QQmlListProperty<QtAddOn::ProcessManager::ProcessBackendFactory> factories READ factories)
 
 public:
     static void registerTypes(const char *uri);
diff --git a/src/declarative/declarativerewritedelegate.cpp b/src/processmanager-declarative/declarativerewritedelegate.cpp
index b0e1959..e6cd819 100644
--- a/src/declarative/declarativerewritedelegate.cpp
+++ b/src/processmanager-declarative/declarativerewritedelegate.cpp
@@ -117,11 +117,12 @@ void DeclarativeRewriteDelegate::componentComplete()
 
 void DeclarativeRewriteDelegate::rewrite(ProcessInfo& info)
 {
-    if (!m_script.script().isEmpty()) {
+    if (!m_script.isEmpty()) {
         if (!m_modelContext)
-            m_modelContext = new QQmlContext(m_script.context(), this);
+            m_modelContext = new QQmlContext(QQmlEngine::contextForObject(this), this);
         m_modelContext->setContextProperty(QStringLiteral("model"), (QObject *) &info);
-        QQmlExpression expr(m_modelContext, m_script.scopeObject(), m_script.script());
+
+        QQmlExpression expr(m_script, m_modelContext);
         expr.evaluate();
     }
 }
diff --git a/src/declarative/declarativerewritedelegate.h b/src/processmanager-declarative/declarativerewritedelegate.h
index 6330723..6330723 100644
--- a/src/declarative/declarativerewritedelegate.h
+++ b/src/processmanager-declarative/declarativerewritedelegate.h
diff --git a/src/declarative/declarativesocketlauncher.cpp b/src/processmanager-declarative/declarativesocketlauncher.cpp
index f6dad60..039a106 100644
--- a/src/declarative/declarativesocketlauncher.cpp
+++ b/src/processmanager-declarative/declarativesocketlauncher.cpp
@@ -150,7 +150,7 @@ void DeclarativeSocketLauncher::append_factory(QQmlListProperty<ProcessBackendFa
 
 QQmlListProperty<ProcessBackendFactory> DeclarativeSocketLauncher::factories()
 {
-    return QQmlListProperty<ProcessBackendFactory>(this, NULL, append_factory);
+    return QQmlListProperty<ProcessBackendFactory>(this, NULL, append_factory, NULL, NULL, NULL);
 }
 
 /*!
diff --git a/src/declarative/declarativesocketlauncher.h b/src/processmanager-declarative/declarativesocketlauncher.h
index feeaedc..cd5fb31 100644
--- a/src/declarative/declarativesocketlauncher.h
+++ b/src/processmanager-declarative/declarativesocketlauncher.h
@@ -50,7 +50,7 @@ class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeSocketLauncher : public SocketLau
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QQmlListProperty<ProcessBackendFactory> factories READ factories)
+    Q_PROPERTY(QQmlListProperty<QtAddOn::ProcessManager::ProcessBackendFactory> factories READ factories)
     Q_PROPERTY(QQmlListProperty<QObject> children READ children)
     Q_CLASSINFO("DefaultProperty", "children")
 
diff --git a/src/declarative/declarative-lib.pri b/src/processmanager-declarative/processmanager-declarative-lib.pri
index d1d0b3e..0279325 100644
--- a/src/declarative/declarative-lib.pri
+++ b/src/processmanager-declarative/processmanager-declarative-lib.pri
@@ -1,4 +1,4 @@
-QT += qml processmanager
+QT += qml processmanager jsonstream
 
 CONFIG += network
 
diff --git a/src/processmanager-declarative/processmanager-declarative.pro b/src/processmanager-declarative/processmanager-declarative.pro
new file mode 100644
index 0000000..b1f6c23
--- /dev/null
+++ b/src/processmanager-declarative/processmanager-declarative.pro
@@ -0,0 +1,7 @@
+TARGET   = QtAddOnProcessManagerDeclarative
+
+load(qt_module)
+
+DEFINES += QT_ADDON_PROCESSMANAGER_LIB
+
+include(processmanager-declarative-lib.pri)
diff --git a/src/core/cpuidledelegate.cpp b/src/processmanager/cpuidledelegate.cpp
index 7ecef6c..7ecef6c 100644
--- a/src/core/cpuidledelegate.cpp
+++ b/src/processmanager/cpuidledelegate.cpp
diff --git a/src/core/cpuidledelegate.h b/src/processmanager/cpuidledelegate.h
index 78abbda..78abbda 100644
--- a/src/core/cpuidledelegate.h
+++ b/src/processmanager/cpuidledelegate.h
diff --git a/src/core/forklauncher.cpp b/src/processmanager/forklauncher.cpp
index e3bd334..e3bd334 100644
--- a/src/core/forklauncher.cpp
+++ b/src/processmanager/forklauncher.cpp
diff --git a/src/core/forklauncher.h b/src/processmanager/forklauncher.h
index 8cb74ea..8cb74ea 100644
--- a/src/core/forklauncher.h
+++ b/src/processmanager/forklauncher.h
diff --git a/src/core/gdbrewritedelegate.cpp b/src/processmanager/gdbrewritedelegate.cpp
index f1a5eba..f1a5eba 100644
--- a/src/core/gdbrewritedelegate.cpp
+++ b/src/processmanager/gdbrewritedelegate.cpp
diff --git a/src/core/gdbrewritedelegate.h b/src/processmanager/gdbrewritedelegate.h
index 3a0867c..3a0867c 100644
--- a/src/core/gdbrewritedelegate.h
+++ b/src/processmanager/gdbrewritedelegate.h
diff --git a/src/core/idledelegate.cpp b/src/processmanager/idledelegate.cpp
index c65f5c7..c65f5c7 100644
--- a/src/core/idledelegate.cpp
+++ b/src/processmanager/idledelegate.cpp
diff --git a/src/core/idledelegate.h b/src/processmanager/idledelegate.h
index cadd915..cadd915 100644
--- a/src/core/idledelegate.h
+++ b/src/processmanager/idledelegate.h
diff --git a/src/core/infomatchdelegate.cpp b/src/processmanager/infomatchdelegate.cpp
index ed6e3fa..ed6e3fa 100644
--- a/src/core/infomatchdelegate.cpp
+++ b/src/processmanager/infomatchdelegate.cpp
diff --git a/src/core/infomatchdelegate.h b/src/processmanager/infomatchdelegate.h
index e5232d6..e5232d6 100644
--- a/src/core/infomatchdelegate.h
+++ b/src/processmanager/infomatchdelegate.h
diff --git a/src/core/ioidledelegate.cpp b/src/processmanager/ioidledelegate.cpp
index 8774d47..8774d47 100644
--- a/src/core/ioidledelegate.cpp
+++ b/src/processmanager/ioidledelegate.cpp
diff --git a/src/core/ioidledelegate.h b/src/processmanager/ioidledelegate.h
index 9e2db92..9e2db92 100644
--- a/src/core/ioidledelegate.h
+++ b/src/processmanager/ioidledelegate.h
diff --git a/src/core/keymatchdelegate.cpp b/src/processmanager/keymatchdelegate.cpp
index af24a4c..af24a4c 100644
--- a/src/core/keymatchdelegate.cpp
+++ b/src/processmanager/keymatchdelegate.cpp
diff --git a/src/core/keymatchdelegate.h b/src/processmanager/keymatchdelegate.h
index 6a41572..6a41572 100644
--- a/src/core/keymatchdelegate.h
+++ b/src/processmanager/keymatchdelegate.h
diff --git a/src/core/launcherclient.cpp b/src/processmanager/launcherclient.cpp
index 1886f69..1886f69 100644
--- a/src/core/launcherclient.cpp
+++ b/src/processmanager/launcherclient.cpp
diff --git a/src/core/launcherclient.h b/src/processmanager/launcherclient.h
index 13dd8e8..13dd8e8 100644
--- a/src/core/launcherclient.h
+++ b/src/processmanager/launcherclient.h
diff --git a/src/core/matchdelegate.cpp b/src/processmanager/matchdelegate.cpp
index a90be18..a90be18 100644
--- a/src/core/matchdelegate.cpp
+++ b/src/processmanager/matchdelegate.cpp
diff --git a/src/core/matchdelegate.h b/src/processmanager/matchdelegate.h
index 6a15b25..6a15b25 100644
--- a/src/core/matchdelegate.h
+++ b/src/processmanager/matchdelegate.h
diff --git a/src/core/memorystatistics_p.h b/src/processmanager/memorystatistics_p.h
index 4d1d9a1..4d1d9a1 100644
--- a/src/core/memorystatistics_p.h
+++ b/src/processmanager/memorystatistics_p.h
diff --git a/src/core/pipelauncher.cpp b/src/processmanager/pipelauncher.cpp
index 61fffc5..61fffc5 100644
--- a/src/core/pipelauncher.cpp
+++ b/src/processmanager/pipelauncher.cpp
diff --git a/src/core/pipelauncher.h b/src/processmanager/pipelauncher.h
index 4465cfc..4465cfc 100644
--- a/src/core/pipelauncher.h
+++ b/src/processmanager/pipelauncher.h
diff --git a/src/core/pipeprocessbackendfactory.cpp b/src/processmanager/pipeprocessbackendfactory.cpp
index 4b7e946..4b7e946 100644
--- a/src/core/pipeprocessbackendfactory.cpp
+++ b/src/processmanager/pipeprocessbackendfactory.cpp
diff --git a/src/core/pipeprocessbackendfactory.h b/src/processmanager/pipeprocessbackendfactory.h
index ed76fd6..ed76fd6 100644
--- a/src/core/pipeprocessbackendfactory.h
+++ b/src/processmanager/pipeprocessbackendfactory.h
diff --git a/src/core/prefork.cpp b/src/processmanager/prefork.cpp
index eae8495..eae8495 100644
--- a/src/core/prefork.cpp
+++ b/src/processmanager/prefork.cpp
diff --git a/src/core/prefork.h b/src/processmanager/prefork.h
index 925bb93..925bb93 100644
--- a/src/core/prefork.h
+++ b/src/processmanager/prefork.h
diff --git a/src/core/preforkprocessbackendfactory.cpp b/src/processmanager/preforkprocessbackendfactory.cpp
index 7ffc90b..7ffc90b 100644
--- a/src/core/preforkprocessbackendfactory.cpp
+++ b/src/processmanager/preforkprocessbackendfactory.cpp
diff --git a/src/core/preforkprocessbackendfactory.h b/src/processmanager/preforkprocessbackendfactory.h
index 3e1b371..3e1b371 100644
--- a/src/core/preforkprocessbackendfactory.h
+++ b/src/processmanager/preforkprocessbackendfactory.h
diff --git a/src/core/prelaunchprocessbackend.cpp b/src/processmanager/prelaunchprocessbackend.cpp
index f855af4..f855af4 100644
--- a/src/core/prelaunchprocessbackend.cpp
+++ b/src/processmanager/prelaunchprocessbackend.cpp
diff --git a/src/core/prelaunchprocessbackend.h b/src/processmanager/prelaunchprocessbackend.h
index cefb1a4..cefb1a4 100644
--- a/src/core/prelaunchprocessbackend.h
+++ b/src/processmanager/prelaunchprocessbackend.h
diff --git a/src/core/prelaunchprocessbackendfactory.cpp b/src/processmanager/prelaunchprocessbackendfactory.cpp
index 06356e3..06356e3 100644
--- a/src/core/prelaunchprocessbackendfactory.cpp
+++ b/src/processmanager/prelaunchprocessbackendfactory.cpp
diff --git a/src/core/prelaunchprocessbackendfactory.h b/src/processmanager/prelaunchprocessbackendfactory.h
index c2b9543..c2b9543 100644
--- a/src/core/prelaunchprocessbackendfactory.h
+++ b/src/processmanager/prelaunchprocessbackendfactory.h
diff --git a/src/core/process.cpp b/src/processmanager/process.cpp
index f838dc9..f838dc9 100644
--- a/src/core/process.cpp
+++ b/src/processmanager/process.cpp
diff --git a/src/core/process.h b/src/processmanager/process.h
index 3b1291b..3b1291b 100644
--- a/src/core/process.h
+++ b/src/processmanager/process.h
diff --git a/src/core/processbackend.cpp b/src/processmanager/processbackend.cpp
index 5288e65..5288e65 100644
--- a/src/core/processbackend.cpp
+++ b/src/processmanager/processbackend.cpp
diff --git a/src/core/processbackend.h b/src/processmanager/processbackend.h
index cafa2b5..cafa2b5 100644
--- a/src/core/processbackend.h
+++ b/src/processmanager/processbackend.h
diff --git a/src/core/processbackendfactory.cpp b/src/processmanager/processbackendfactory.cpp
index c9d030b..c9d030b 100644
--- a/src/core/processbackendfactory.cpp
+++ b/src/processmanager/processbackendfactory.cpp
diff --git a/src/core/processbackendfactory.h b/src/processmanager/processbackendfactory.h
index c313442..c313442 100644
--- a/src/core/processbackendfactory.h
+++ b/src/processmanager/processbackendfactory.h
diff --git a/src/core/processbackendmanager.cpp b/src/processmanager/processbackendmanager.cpp
index 6321929..6321929 100644
--- a/src/core/processbackendmanager.cpp
+++ b/src/processmanager/processbackendmanager.cpp
diff --git a/src/core/processbackendmanager.h b/src/processmanager/processbackendmanager.h
index 2c4fcbb..2c4fcbb 100644
--- a/src/core/processbackendmanager.h
+++ b/src/processmanager/processbackendmanager.h
diff --git a/src/core/processfrontend.cpp b/src/processmanager/processfrontend.cpp
index 5876f39..5876f39 100644
--- a/src/core/processfrontend.cpp
+++ b/src/processmanager/processfrontend.cpp
diff --git a/src/core/processfrontend.h b/src/processmanager/processfrontend.h
index 6f7f231..6f7f231 100644
--- a/src/core/processfrontend.h
+++ b/src/processmanager/processfrontend.h
diff --git a/src/core/processinfo.cpp b/src/processmanager/processinfo.cpp
index ba37fa5..ba37fa5 100644
--- a/src/core/processinfo.cpp
+++ b/src/processmanager/processinfo.cpp
diff --git a/src/core/processinfo.h b/src/processmanager/processinfo.h
index 38721f7..38721f7 100644
--- a/src/core/processinfo.h
+++ b/src/processmanager/processinfo.h
diff --git a/src/core/processlist.h b/src/processmanager/processlist.h
index c96a618..c96a618 100644
--- a/src/core/processlist.h
+++ b/src/processmanager/processlist.h
diff --git a/src/core/processmanager-global.h b/src/processmanager/processmanager-global.h
index 59be0bf..59be0bf 100644
--- a/src/core/processmanager-global.h
+++ b/src/processmanager/processmanager-global.h
diff --git a/src/core/core-lib.pri b/src/processmanager/processmanager-lib.pri
index 8029a5b..8029a5b 100644
--- a/src/core/core-lib.pri
+++ b/src/processmanager/processmanager-lib.pri
diff --git a/src/core/processmanager.cpp b/src/processmanager/processmanager.cpp
index ac49d23..ac49d23 100644
--- a/src/core/processmanager.cpp
+++ b/src/processmanager/processmanager.cpp
diff --git a/src/core/processmanager.h b/src/processmanager/processmanager.h
index b53260d..b53260d 100644
--- a/src/core/processmanager.h
+++ b/src/processmanager/processmanager.h
diff --git a/src/processmanager/processmanager.pro b/src/processmanager/processmanager.pro
new file mode 100644
index 0000000..ddc714d
--- /dev/null
+++ b/src/processmanager/processmanager.pro
@@ -0,0 +1,14 @@
+TARGET   = QtAddOnProcessManager
+
+load(qt_module)
+
+DEFINES += QT_ADDON_PROCESSMANAGER_LIB
+
+QMAKE_CXXFLAGS += -fPIC -fvisibility-inlines-hidden
+LIBS += -ldl
+
+linux*:!CONFIG(bionic): LIBS += -lcap
+
+include($$PWD/processmanager-lib.pri)
+
+mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.processmanager.name
diff --git a/src/core/procutils.cpp b/src/processmanager/procutils.cpp
index 9def49c..9def49c 100644
--- a/src/core/procutils.cpp
+++ b/src/processmanager/procutils.cpp
diff --git a/src/core/procutils.h b/src/processmanager/procutils.h
index 0c89226..0c89226 100644
--- a/src/core/procutils.h
+++ b/src/processmanager/procutils.h
diff --git a/src/core/remoteprocessbackend.cpp b/src/processmanager/remoteprocessbackend.cpp
index db8d344..db8d344 100644
--- a/src/core/remoteprocessbackend.cpp
+++ b/src/processmanager/remoteprocessbackend.cpp
diff --git a/src/core/remoteprocessbackend.h b/src/processmanager/remoteprocessbackend.h
index c57c492..c57c492 100644
--- a/src/core/remoteprocessbackend.h
+++ b/src/processmanager/remoteprocessbackend.h
diff --git a/src/core/remoteprocessbackendfactory.cpp b/src/processmanager/remoteprocessbackendfactory.cpp
index ba55297..ba55297 100644
--- a/src/core/remoteprocessbackendfactory.cpp
+++ b/src/processmanager/remoteprocessbackendfactory.cpp
diff --git a/src/core/remoteprocessbackendfactory.h b/src/processmanager/remoteprocessbackendfactory.h
index 86417b6..86417b6 100644
--- a/src/core/remoteprocessbackendfactory.h
+++ b/src/processmanager/remoteprocessbackendfactory.h
diff --git a/src/core/remoteprotocol.h b/src/processmanager/remoteprotocol.h
index ed91e8d..ed91e8d 100644
--- a/src/core/remoteprotocol.h
+++ b/src/processmanager/remoteprotocol.h
diff --git a/src/core/rewritedelegate.cpp b/src/processmanager/rewritedelegate.cpp
index 287b232..287b232 100644
--- a/src/core/rewritedelegate.cpp
+++ b/src/processmanager/rewritedelegate.cpp
diff --git a/src/core/rewritedelegate.h b/src/processmanager/rewritedelegate.h
index f40c25f..f40c25f 100644
--- a/src/core/rewritedelegate.h
+++ b/src/processmanager/rewritedelegate.h
diff --git a/src/core/socketlauncher.cpp b/src/processmanager/socketlauncher.cpp
index 249a102..249a102 100644
--- a/src/core/socketlauncher.cpp
+++ b/src/processmanager/socketlauncher.cpp
diff --git a/src/core/socketlauncher.h b/src/processmanager/socketlauncher.h
index 33058bd..33058bd 100644
--- a/src/core/socketlauncher.h
+++ b/src/processmanager/socketlauncher.h
diff --git a/src/core/socketprocessbackendfactory.cpp b/src/processmanager/socketprocessbackendfactory.cpp
index d30e7fc..d30e7fc 100644
--- a/src/core/socketprocessbackendfactory.cpp
+++ b/src/processmanager/socketprocessbackendfactory.cpp
diff --git a/src/core/socketprocessbackendfactory.h b/src/processmanager/socketprocessbackendfactory.h
index b305716..b305716 100644
--- a/src/core/socketprocessbackendfactory.h
+++ b/src/processmanager/socketprocessbackendfactory.h
diff --git a/src/core/standardprocessbackend.cpp b/src/processmanager/standardprocessbackend.cpp
index 94d7c90..94d7c90 100644
--- a/src/core/standardprocessbackend.cpp
+++ b/src/processmanager/standardprocessbackend.cpp
diff --git a/src/core/standardprocessbackend.h b/src/processmanager/standardprocessbackend.h
index 3862bb6..3862bb6 100644
--- a/src/core/standardprocessbackend.h
+++ b/src/processmanager/standardprocessbackend.h
diff --git a/src/core/standardprocessbackendfactory.cpp b/src/processmanager/standardprocessbackendfactory.cpp
index c62d94b..c62d94b 100644
--- a/src/core/standardprocessbackendfactory.cpp
+++ b/src/processmanager/standardprocessbackendfactory.cpp
diff --git a/src/core/standardprocessbackendfactory.h b/src/processmanager/standardprocessbackendfactory.h
index c31cc56..c31cc56 100644
--- a/src/core/standardprocessbackendfactory.h
+++ b/src/processmanager/standardprocessbackendfactory.h
diff --git a/src/core/timeoutidledelegate.cpp b/src/processmanager/timeoutidledelegate.cpp
index 68305fe..68305fe 100644
--- a/src/core/timeoutidledelegate.cpp
+++ b/src/processmanager/timeoutidledelegate.cpp
diff --git a/src/core/timeoutidledelegate.h b/src/processmanager/timeoutidledelegate.h
index 73f5f0a..73f5f0a 100644
--- a/src/core/timeoutidledelegate.h
+++ b/src/processmanager/timeoutidledelegate.h
diff --git a/src/core/unixprocessbackend.cpp b/src/processmanager/unixprocessbackend.cpp
index c211d63..c211d63 100644
--- a/src/core/unixprocessbackend.cpp
+++ b/src/processmanager/unixprocessbackend.cpp
diff --git a/src/core/unixprocessbackend.h b/src/processmanager/unixprocessbackend.h
index 9177e0f..9177e0f 100644
--- a/src/core/unixprocessbackend.h
+++ b/src/processmanager/unixprocessbackend.h
diff --git a/src/core/unixsandboxprocess.cpp b/src/processmanager/unixsandboxprocess.cpp
index a1a70e2..a1a70e2 100644
--- a/src/core/unixsandboxprocess.cpp
+++ b/src/processmanager/unixsandboxprocess.cpp
diff --git a/src/core/unixsandboxprocess.h b/src/processmanager/unixsandboxprocess.h
index e007250..e007250 100644
--- a/src/core/unixsandboxprocess.h
+++ b/src/processmanager/unixsandboxprocess.h
diff --git a/src/src.pro b/src/src.pro
index bfe3ffa..524733a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-SUBDIRS = core declarative
+SUBDIRS = processmanager processmanager-declarative
diff --git a/sync.profile b/sync.profile
index 2a237f0..43f7395 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
-    "QtAddOnProcessManager" => "$basedir/src/core",
-    "QtAddOnProcessManagerDeclarative" => "$basedir/src/declarative",
+    "QtAddOnProcessManager" => "$basedir/src/processmanager",
+    "QtAddOnProcessManagerDeclarative" => "$basedir/src/processmanager-declarative",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
@@ -11,10 +11,6 @@
     "core" => "#include <QtCore/QtCore>\n",
     "network" => "#include <QtNetwork/QtNetwork>\n",
 );
-%modulepris = (
-    "QtAddOnProcessManager" => "$basedir/modules/qt_processmanager.pri",
-    "QtAddOnProcessManagerDeclarative" => "$basedir/modules/qt_processmanagerdeclarative.pri",
-);
 # Module dependencies.
 # Every module that is required to build this module should have one entry.
 # Each of the module version specifiers can take one of the following values:
@@ -22,7 +18,7 @@
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
 #
 %dependencies = (
-        "qtbase" => "refs/heads/master",
-        "qtdeclarative" => "refs/heads/master",
-        "qtjsbackend" => "refs/heads/master",
+        "qtbase" => "refs/heads/stable",
+        "qtdeclarative" => "refs/heads/stable",
+        "qtjsbackend" => "refs/heads/stable",
 );
diff --git a/tests/auto/declarative/test/test.pro b/tests/auto/declarative/test/test.pro
index cec2dfd..2ddd95e 100644
--- a/tests/auto/declarative/test/test.pro
+++ b/tests/auto/declarative/test/test.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 macx:CONFIG -= app_bundle
 
-QT += core network qml testlib processmanager processmanagerdeclarative
+QT += core network qml testlib processmanager processmanager-declarative jsonstream
 
 include(../declarative.pri)
 
diff --git a/tests/auto/declarative/testSocketLauncher/testSocketLauncher.pro b/tests/auto/declarative/testSocketLauncher/testSocketLauncher.pro
index 5e6fa8e..c369f30 100644
--- a/tests/auto/declarative/testSocketLauncher/testSocketLauncher.pro
+++ b/tests/auto/declarative/testSocketLauncher/testSocketLauncher.pro
@@ -1,5 +1,5 @@
 CONFIG -= app_bundle
-QT += processmanagerdeclarative jsonstream qml
+QT += processmanager processmanager-declarative jsonstream qml
 
 include(../declarative.pri)
 
diff --git a/tests/auto/declarative/tst_declarative.cpp b/tests/auto/declarative/tst_declarative.cpp
index e028e5d..40f85da 100644
--- a/tests/auto/declarative/tst_declarative.cpp
+++ b/tests/auto/declarative/tst_declarative.cpp
@@ -158,18 +158,18 @@ public:
         QVERIFY(stateSpy.count() == stateCount);
         bool failedToStart = false;
         for (int i = 0 ; i < errorSpy.count() ; i++)
-            if (qVariantValue<QProcess::ProcessError>(errorSpy.at(i).at(0)) == QProcess::FailedToStart)
+            if (errorSpy.at(i).at(0).value<QProcess::ProcessError>() == QProcess::FailedToStart)
                 failedToStart = true;
 
         if (failedToStart)
             QVERIFY(stateCount <=2);
         if (stateCount > 0)
-            QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(0).at(0)), QProcess::Starting);
+            QCOMPARE(stateSpy.at(0).at(0).value<QProcess::ProcessState>(), QProcess::Starting);
         if (stateCount > 1)
-            QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(1).at(0)),
+            QCOMPARE(stateSpy.at(1).at(0).value<QProcess::ProcessState>(),
                      (failedToStart ? QProcess::NotRunning : QProcess::Running));
         if (stateCount > 2)
-            QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(2).at(0)), QProcess::NotRunning);
+            QCOMPARE(stateSpy.at(2).at(0).value<QProcess::ProcessState>(), QProcess::NotRunning);
     }
 
     void waitStart(int timeout=5000) {
@@ -207,18 +207,18 @@ public:
 
     void checkExitCode(int exitCode) {
         QVERIFY(finishedSpy.count() == 1);
-        QCOMPARE(qVariantValue<int>(finishedSpy.at(0).at(0)), exitCode);
+        QCOMPARE(finishedSpy.at(0).at(0).toInt(), exitCode);
     }
 
     void checkExitStatus(QProcess::ExitStatus exitStatus) {
         QVERIFY(finishedSpy.count() == 1);
-        QCOMPARE(qVariantValue<QProcess::ExitStatus>(finishedSpy.at(0).at(1)), exitStatus);
+        QCOMPARE(finishedSpy.at(0).at(1).value<QProcess::ExitStatus>(), exitStatus);
     }
 
     void checkErrors(const QList<QProcess::ProcessError>& list) {
         QCOMPARE(errorSpy.count(), list.count());
         for (int i = 0 ; i < errorSpy.count() ; i++)
-            QCOMPARE(qVariantValue<QProcess::ProcessError>(errorSpy.at(i).at(0)), list.at(i));
+            QCOMPARE(errorSpy.at(i).at(0).value<QProcess::ProcessError>(), list.at(i));
     }
 
     QTime      stopWatch;
diff --git a/tests/auto/processmanager/testPipeLauncher/testPipeLauncher.pro b/tests/auto/processmanager/testPipeLauncher/testPipeLauncher.pro
index 1d903ca..7619907 100644
--- a/tests/auto/processmanager/testPipeLauncher/testPipeLauncher.pro
+++ b/tests/auto/processmanager/testPipeLauncher/testPipeLauncher.pro
@@ -1,5 +1,5 @@
 CONFIG -= app_bundle
-QT += processmanager
+QT += processmanager jsonstream
 QT -= gui
 
 include(../processmanager.pri)
diff --git a/tests/auto/processmanager/tst_processmanager.cpp b/tests/auto/processmanager/tst_processmanager.cpp
index 0d5e7c5..db10998 100644
--- a/tests/auto/processmanager/tst_processmanager.cpp
+++ b/tests/auto/processmanager/tst_processmanager.cpp
@@ -288,12 +288,12 @@ public:
         if (failedToStart)
             QVERIFY(stateCount <=2);
         if (stateCount > 0)
-            QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(0).at(0)), QProcess::Starting);
+            QCOMPARE(stateSpy.at(0).at(0).value<QProcess::ProcessState>(), QProcess::Starting);
         if (stateCount > 1)
-            QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(1).at(0)),
+            QCOMPARE(stateSpy.at(1).at(0).value<QProcess::ProcessState>(),
                      (failedToStart ? QProcess::NotRunning : QProcess::Running));
         if (stateCount > 2)
-            QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(2).at(0)), QProcess::NotRunning);
+            QCOMPARE(stateSpy.at(2).at(0).value<QProcess::ProcessState>(), QProcess::NotRunning);
     }
 
     void checkStdout(const QByteArray s) {
@@ -322,12 +322,12 @@ public:
 
     void checkExitCode(int exitCode) {
         QVERIFY(finishedSpy.count() == 1);
-        QCOMPARE(qVariantValue<int>(finishedSpy.at(0).at(0)), exitCode);
+        QCOMPARE(finishedSpy.at(0).at(0).value<int>(), exitCode);
     }
 
     void checkExitStatus(QProcess::ExitStatus exitStatus) {
         QVERIFY(finishedSpy.count() == 1);
-        QCOMPARE(qVariantValue<QProcess::ExitStatus>(finishedSpy.at(0).at(1)), exitStatus);
+        QCOMPARE(finishedSpy.at(0).at(1).value<QProcess::ExitStatus>(), exitStatus);
     }
 
     void checkErrors(const QList<QProcess::ProcessError>& list) {
diff --git a/tests/manual/procutils/main.cpp b/tests/manual/procutils/main.cpp
index 85cd3cf..627ba23 100644
--- a/tests/manual/procutils/main.cpp
+++ b/tests/manual/procutils/main.cpp
@@ -46,6 +46,8 @@
 //#include <string.h>
 #include <errno.h>
 #include <iostream>
+#include <sys/types.h>
+#include <unistd.h>
 
 QT_USE_NAMESPACE_PROCESSMANAGER