declarative -> qml renaming

Change-Id: I0612bc25e5d40dde12aa6f09158e30b0a94cd6af
Reviewed-by: Andrew Christian <andrew.christian@nokia.com>

11 files changed, 117 insertions, 117 deletions

diff --git a/src/declarative/declarative-lib.pri b/src/declarative/declarative-lib.pri
index b07b959..3b14f48 100644
--- a/src/declarative/declarative-lib.pri
+++ b/src/declarative/declarative-lib.pri
@@ -1,4 +1,4 @@
-QT += declarative processmanager
+QT += qml processmanager
 
 CONFIG += network
 
diff --git a/src/declarative/declarativematchdelegate.cpp b/src/declarative/declarativematchdelegate.cpp
index 54d8fcb..58c5c53 100644
--- a/src/declarative/declarativematchdelegate.cpp
+++ b/src/declarative/declarativematchdelegate.cpp
@@ -90,18 +90,18 @@ bool DeclarativeMatchDelegate::matches(const ProcessInfo& info)
         return false;
 
     if (!m_modelContext)
-        m_modelContext = new QDeclarativeContext(m_script.context(), this);
+        m_modelContext = new QQmlContext(m_script.context(), this);
     m_modelContext->setContextProperty(QStringLiteral("model"), (QObject *) &info);
-    QDeclarativeExpression expr(m_modelContext, m_script.scopeObject(), m_script.script());
+    QQmlExpression expr(m_modelContext, m_script.scopeObject(), m_script.script());
     return expr.evaluate().toBool();
 }
 
-QDeclarativeScriptString DeclarativeMatchDelegate::script() const
+QQmlScriptString DeclarativeMatchDelegate::script() const
 {
     return m_script;
 }
 
-void DeclarativeMatchDelegate::setScript(const QDeclarativeScriptString& script)
+void DeclarativeMatchDelegate::setScript(const QQmlScriptString& script)
 {
     m_script = script;
     emit scriptChanged();
diff --git a/src/declarative/declarativematchdelegate.h b/src/declarative/declarativematchdelegate.h
index 01d834b..d8ddb86 100644
--- a/src/declarative/declarativematchdelegate.h
+++ b/src/declarative/declarativematchdelegate.h
@@ -40,24 +40,24 @@
 #ifndef DECLARATIVE_MATCH_DELEGATE_H
 #define DECLARATIVE_MATCH_DELEGATE_H
 
-#include <QtDeclarative>
+#include <QtQml>
 #include "matchdelegate.h"
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeMatchDelegate : public MatchDelegate,
-                                                               public QDeclarativeParserStatus
+                                                               public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript NOTIFY scriptChanged)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlScriptString script READ script WRITE setScript NOTIFY scriptChanged)
 
 public:
     DeclarativeMatchDelegate(QObject *parent=0);
     virtual bool matches(const ProcessInfo& info);
 
-    QDeclarativeScriptString script() const;
-    void                     setScript(const QDeclarativeScriptString&);
+    QQmlScriptString script() const;
+    void                     setScript(const QQmlScriptString&);
 
     void classBegin();
     void componentComplete();
@@ -66,8 +66,8 @@ signals:
     void scriptChanged();
 
 private:
-    QDeclarativeScriptString m_script;
-    QDeclarativeContext     *m_modelContext;
+    QQmlScriptString m_script;
+    QQmlContext     *m_modelContext;
 };
 
 QT_END_NAMESPACE_PROCESSMANAGER
diff --git a/src/declarative/declarativeprocessmanager.cpp b/src/declarative/declarativeprocessmanager.cpp
index b4c30e1..d070873 100644
--- a/src/declarative/declarativeprocessmanager.cpp
+++ b/src/declarative/declarativeprocessmanager.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 /*!
   \class DeclarativeProcessManager DeclarativeProcessManager
   \brief The DeclarativeProcessManager class encapsulates ways of creating and tracking processes
-         suitable for QtDeclarative programs.
+         suitable for QtQml programs.
 */
 
 /*!
@@ -77,7 +77,7 @@ void DeclarativeProcessManager::componentComplete()
 /*!
   \internal
 */
-void DeclarativeProcessManager::append_factory(QDeclarativeListProperty<ProcessBackendFactory> *list,
+void DeclarativeProcessManager::append_factory(QQmlListProperty<ProcessBackendFactory> *list,
                                                ProcessBackendFactory *factory)
 {
     DeclarativeProcessManager *manager = static_cast<DeclarativeProcessManager *>(list->object);
@@ -89,9 +89,9 @@ void DeclarativeProcessManager::append_factory(QDeclarativeListProperty<ProcessB
     \internal
  */
 
-QDeclarativeListProperty<ProcessBackendFactory> DeclarativeProcessManager::factories()
+QQmlListProperty<ProcessBackendFactory> DeclarativeProcessManager::factories()
 {
-    return QDeclarativeListProperty<ProcessBackendFactory>(this, NULL, append_factory);
+    return QQmlListProperty<ProcessBackendFactory>(this, NULL, append_factory);
 }
 
 /*!
diff --git a/src/declarative/declarativeprocessmanager.h b/src/declarative/declarativeprocessmanager.h
index c0ad19d..695ff68 100644
--- a/src/declarative/declarativeprocessmanager.h
+++ b/src/declarative/declarativeprocessmanager.h
@@ -41,24 +41,24 @@
 #define DECLARATIVE_PROCESS_MANAGER_H
 
 #include "processmanager.h"
-#include <QDeclarativeListProperty>
-#include <QDeclarativeParserStatus>
-#include <qdeclarative.h>
+#include <QQmlListProperty>
+#include <QQmlParserStatus>
+#include <qqml.h>
 
 #include "processmanager-global.h"
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeProcessManager : public ProcessManager,
-                                                                public QDeclarativeParserStatus
+                                                                public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeListProperty<ProcessBackendFactory> factories READ factories)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlListProperty<ProcessBackendFactory> factories READ factories)
 
 public:
     DeclarativeProcessManager(QObject *parent=0);
-    QDeclarativeListProperty<ProcessBackendFactory> factories();
+    QQmlListProperty<ProcessBackendFactory> factories();
 
     void classBegin();
     void componentComplete();
@@ -82,7 +82,7 @@ protected slots:
     virtual void processFrontendDestroyed();
 
 private:
-    static void append_factory(QDeclarativeListProperty<ProcessBackendFactory>*,
+    static void append_factory(QQmlListProperty<ProcessBackendFactory>*,
                                ProcessBackendFactory*);
 };
 
diff --git a/src/declarative/declarativerewritedelegate.cpp b/src/declarative/declarativerewritedelegate.cpp
index 415dd55..9f35399 100644
--- a/src/declarative/declarativerewritedelegate.cpp
+++ b/src/declarative/declarativerewritedelegate.cpp
@@ -93,19 +93,19 @@ void DeclarativeRewriteDelegate::rewrite(ProcessInfo& info)
 {
     if (!m_script.script().isEmpty()) {
         if (!m_modelContext)
-            m_modelContext = new QDeclarativeContext(m_script.context(), this);
+            m_modelContext = new QQmlContext(m_script.context(), this);
         m_modelContext->setContextProperty(QStringLiteral("model"), (QObject *) &info);
-        QDeclarativeExpression expr(m_modelContext, m_script.scopeObject(), m_script.script());
+        QQmlExpression expr(m_modelContext, m_script.scopeObject(), m_script.script());
         expr.evaluate();
     }
 }
 
-QDeclarativeScriptString DeclarativeRewriteDelegate::script() const
+QQmlScriptString DeclarativeRewriteDelegate::script() const
 {
     return m_script;
 }
 
-void DeclarativeRewriteDelegate::setScript(const QDeclarativeScriptString& script)
+void DeclarativeRewriteDelegate::setScript(const QQmlScriptString& script)
 {
     m_script = script;
     emit scriptChanged();
diff --git a/src/declarative/declarativerewritedelegate.h b/src/declarative/declarativerewritedelegate.h
index 541fe9f..6330723 100644
--- a/src/declarative/declarativerewritedelegate.h
+++ b/src/declarative/declarativerewritedelegate.h
@@ -40,24 +40,24 @@
 #ifndef DECLARATIVE_REWRITE_DELEGATE_H
 #define DECLARATIVE_REWRITE_DELEGATE_H
 
-#include <QtDeclarative>
+#include <QtQml>
 #include "rewritedelegate.h"
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeRewriteDelegate : public RewriteDelegate,
-                                                                 public QDeclarativeParserStatus
+                                                                 public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript NOTIFY scriptChanged)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlScriptString script READ script WRITE setScript NOTIFY scriptChanged)
 
 public:
     DeclarativeRewriteDelegate(QObject *parent=0);
     virtual void rewrite(ProcessInfo& info);
 
-    QDeclarativeScriptString script() const;
-    void                     setScript(const QDeclarativeScriptString&);
+    QQmlScriptString script() const;
+    void                     setScript(const QQmlScriptString&);
 
     void classBegin();
     void componentComplete();
@@ -66,8 +66,8 @@ signals:
     void scriptChanged();
 
 private:
-    QDeclarativeScriptString m_script;
-    QDeclarativeContext     *m_modelContext;
+    QQmlScriptString m_script;
+    QQmlContext     *m_modelContext;
 };
 
 QT_END_NAMESPACE_PROCESSMANAGER
diff --git a/src/declarative/declarativesocketlauncher.cpp b/src/declarative/declarativesocketlauncher.cpp
index 1a4bd6a..8308a24 100644
--- a/src/declarative/declarativesocketlauncher.cpp
+++ b/src/declarative/declarativesocketlauncher.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 /*!
   \qmlclass Launcher DeclarativeSocketLauncher
   \brief The Launcher class encapsulates ways of creating and tracking processes
-         suitable for QtDeclarative programs.
+         suitable for QtQml programs.
 
    The Launcher class is used to create a standalone program for launching
    and tracking child processes.  Other programs can connect to the Launcher using
@@ -115,7 +115,7 @@ void DeclarativeSocketLauncher::componentComplete()
 {
 }
 
-void DeclarativeSocketLauncher::append_factory(QDeclarativeListProperty<ProcessBackendFactory> *list,
+void DeclarativeSocketLauncher::append_factory(QQmlListProperty<ProcessBackendFactory> *list,
                                                ProcessBackendFactory *factory)
 {
     DeclarativeSocketLauncher *launcher = static_cast<DeclarativeSocketLauncher *>(list->object);
@@ -123,14 +123,14 @@ void DeclarativeSocketLauncher::append_factory(QDeclarativeListProperty<ProcessB
         launcher->addFactory(factory);
 }
 
-QDeclarativeListProperty<ProcessBackendFactory> DeclarativeSocketLauncher::factories()
+QQmlListProperty<ProcessBackendFactory> DeclarativeSocketLauncher::factories()
 {
-    return QDeclarativeListProperty<ProcessBackendFactory>(this, NULL, append_factory);
+    return QQmlListProperty<ProcessBackendFactory>(this, NULL, append_factory);
 }
 
-QDeclarativeListProperty<QObject> DeclarativeSocketLauncher::children()
+QQmlListProperty<QObject> DeclarativeSocketLauncher::children()
 {
-    return QDeclarativeListProperty<QObject>(this, m_children);
+    return QQmlListProperty<QObject>(this, m_children);
 }
 
 #include "moc_declarativesocketlauncher.cpp"
diff --git a/src/declarative/declarativesocketlauncher.h b/src/declarative/declarativesocketlauncher.h
index 64036bd..feeaedc 100644
--- a/src/declarative/declarativesocketlauncher.h
+++ b/src/declarative/declarativesocketlauncher.h
@@ -40,30 +40,30 @@
 #ifndef DECLARATIVE_SOCKET_LAUNCHER_H
 #define DECLARATIVE_SOCKET_LAUNCHER_H
 
-#include <QtDeclarative>
+#include <QtQml>
 #include "socketlauncher.h"
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeSocketLauncher : public SocketLauncher,
-                                                                public QDeclarativeParserStatus
+                                                                public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeListProperty<ProcessBackendFactory> factories READ factories)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> children READ children)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlListProperty<ProcessBackendFactory> factories READ factories)
+    Q_PROPERTY(QQmlListProperty<QObject> children READ children)
     Q_CLASSINFO("DefaultProperty", "children")
 
 public:
     DeclarativeSocketLauncher(QObject *parent=0);
-    QDeclarativeListProperty<ProcessBackendFactory> factories();
-    QDeclarativeListProperty<QObject>               children();
+    QQmlListProperty<ProcessBackendFactory> factories();
+    QQmlListProperty<QObject>               children();
 
     void classBegin();
     void componentComplete();
 
 private:
-    static void append_factory(QDeclarativeListProperty<ProcessBackendFactory>*,
+    static void append_factory(QQmlListProperty<ProcessBackendFactory>*,
                                ProcessBackendFactory*);
     QList<QObject *> m_children;
 };
diff --git a/src/declarative/processinfotemplate.cpp b/src/declarative/processinfotemplate.cpp
index 9a57efb..3e2309e 100644
--- a/src/declarative/processinfotemplate.cpp
+++ b/src/declarative/processinfotemplate.cpp
@@ -40,7 +40,7 @@
 #include "processinfotemplate.h"
 #include "processinfo.h"
 
-#include <QtDeclarative/QDeclarativeExpression>
+#include <QtQml/QQmlExpression>
 
 #include <QFileInfo>
 #include <QDir>
@@ -160,7 +160,7 @@ QString ProcessInfoTemplate::identifier() const
     Return the template programName
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::programName() const
+QQmlScriptString ProcessInfoTemplate::programName() const
 {
     return scriptString(ProcessInfoConstants::Program);
 }
@@ -169,7 +169,7 @@ QDeclarativeScriptString ProcessInfoTemplate::programName() const
     Return the template uid
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::uid() const
+QQmlScriptString ProcessInfoTemplate::uid() const
 {
     return scriptString(ProcessInfoConstants::Uid);
 }
@@ -178,7 +178,7 @@ QDeclarativeScriptString ProcessInfoTemplate::uid() const
     Return the template gid
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::gid() const
+QQmlScriptString ProcessInfoTemplate::gid() const
 {
     return scriptString(ProcessInfoConstants::Gid);
 }
@@ -187,7 +187,7 @@ QDeclarativeScriptString ProcessInfoTemplate::gid() const
     Return the template workingDirectory
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::workingDirectory() const
+QQmlScriptString ProcessInfoTemplate::workingDirectory() const
 {
     return scriptString(ProcessInfoConstants::WorkingDirectory);
 }
@@ -196,7 +196,7 @@ QDeclarativeScriptString ProcessInfoTemplate::workingDirectory() const
     Return the template environment
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::environment() const
+QQmlScriptString ProcessInfoTemplate::environment() const
 {
     return scriptString(ProcessInfoConstants::Environment);
 }
@@ -205,7 +205,7 @@ QDeclarativeScriptString ProcessInfoTemplate::environment() const
     Return the template arguments
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::arguments() const
+QQmlScriptString ProcessInfoTemplate::arguments() const
 {
     return scriptString(ProcessInfoConstants::Arguments);
 }
@@ -214,7 +214,7 @@ QDeclarativeScriptString ProcessInfoTemplate::arguments() const
     Return the template startOutputPattern
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::startOutputPattern() const
+QQmlScriptString ProcessInfoTemplate::startOutputPattern() const
 {
     return scriptString(ProcessInfoConstants::StartOutputPattern);
 }
@@ -223,7 +223,7 @@ QDeclarativeScriptString ProcessInfoTemplate::startOutputPattern() const
     Return the template priority
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::priority() const
+QQmlScriptString ProcessInfoTemplate::priority() const
 {
     return scriptString(ProcessInfoConstants::Priority);
 }
@@ -232,7 +232,7 @@ QDeclarativeScriptString ProcessInfoTemplate::priority() const
     Return the template customValues
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::customValues() const
+QQmlScriptString ProcessInfoTemplate::customValues() const
 {
     return scriptString(kCustomValuesStr);
 }
@@ -241,7 +241,7 @@ QDeclarativeScriptString ProcessInfoTemplate::customValues() const
     Return the template oomAdjustment
 */
 
-QDeclarativeScriptString ProcessInfoTemplate::oomAdjustment() const
+QQmlScriptString ProcessInfoTemplate::oomAdjustment() const
 {
     return scriptString(ProcessInfoConstants::OomAdjustment);
 }
@@ -260,7 +260,7 @@ void ProcessInfoTemplate::setIdentifier(const QString &identifier)
     Set the template \a programName
 */
 
-void ProcessInfoTemplate::setProgramName(const QDeclarativeScriptString &programName)
+void ProcessInfoTemplate::setProgramName(const QQmlScriptString &programName)
 {
     setScriptString(ProcessInfoConstants::Program, programName);
     emit programNameChanged();
@@ -270,7 +270,7 @@ void ProcessInfoTemplate::setProgramName(const QDeclarativeScriptString &program
     Set the template \a uid
 */
 
-void ProcessInfoTemplate::setUid(const QDeclarativeScriptString &uid)
+void ProcessInfoTemplate::setUid(const QQmlScriptString &uid)
 {
     setScriptString(ProcessInfoConstants::Uid, uid);
     emit uidChanged();
@@ -280,7 +280,7 @@ void ProcessInfoTemplate::setUid(const QDeclarativeScriptString &uid)
     Set the template \a gid
 */
 
-void ProcessInfoTemplate::setGid(const QDeclarativeScriptString &gid)
+void ProcessInfoTemplate::setGid(const QQmlScriptString &gid)
 {
     setScriptString(ProcessInfoConstants::Gid, gid);
     emit gidChanged();
@@ -290,7 +290,7 @@ void ProcessInfoTemplate::setGid(const QDeclarativeScriptString &gid)
     Set the template \a workingDirectory
 */
 
-void ProcessInfoTemplate::setWorkingDirectory(const QDeclarativeScriptString &workingDirectory)
+void ProcessInfoTemplate::setWorkingDirectory(const QQmlScriptString &workingDirectory)
 {
     setScriptString(ProcessInfoConstants::WorkingDirectory, workingDirectory);
     emit workingDirectoryChanged();
@@ -300,7 +300,7 @@ void ProcessInfoTemplate::setWorkingDirectory(const QDeclarativeScriptString &wo
     Set the template \a env environment
 */
 
-void ProcessInfoTemplate::setEnvironment(QDeclarativeScriptString environment)
+void ProcessInfoTemplate::setEnvironment(QQmlScriptString environment)
 {
     setScriptString(ProcessInfoConstants::Environment, environment);
     emit environmentChanged();
@@ -310,7 +310,7 @@ void ProcessInfoTemplate::setEnvironment(QDeclarativeScriptString environment)
     Set the template \a arguments
 */
 
-void ProcessInfoTemplate::setArguments(const QDeclarativeScriptString &arguments)
+void ProcessInfoTemplate::setArguments(const QQmlScriptString &arguments)
 {
     setScriptString(ProcessInfoConstants::Arguments, arguments);
     emit argumentsChanged();
@@ -320,7 +320,7 @@ void ProcessInfoTemplate::setArguments(const QDeclarativeScriptString &arguments
     Set the template \a startOutputPattern
 */
 
-void ProcessInfoTemplate::setStartOutputPattern(const QDeclarativeScriptString &startOutputPattern)
+void ProcessInfoTemplate::setStartOutputPattern(const QQmlScriptString &startOutputPattern)
 {
     setScriptString(ProcessInfoConstants::StartOutputPattern, startOutputPattern);
     emit startOutputPatternChanged();
@@ -330,7 +330,7 @@ void ProcessInfoTemplate::setStartOutputPattern(const QDeclarativeScriptString &
     Set the template \a priority
 */
 
-void ProcessInfoTemplate::setPriority(const QDeclarativeScriptString &priority)
+void ProcessInfoTemplate::setPriority(const QQmlScriptString &priority)
 {
     setScriptString(ProcessInfoConstants::Priority, priority);
     emit priorityChanged();
@@ -340,7 +340,7 @@ void ProcessInfoTemplate::setPriority(const QDeclarativeScriptString &priority)
     Set the template \a customValues
 */
 
-void ProcessInfoTemplate::setCustomValues(const QDeclarativeScriptString &customValues)
+void ProcessInfoTemplate::setCustomValues(const QQmlScriptString &customValues)
 {
     setScriptString(kCustomValuesStr, customValues);
     emit customValuesChanged();
@@ -350,7 +350,7 @@ void ProcessInfoTemplate::setCustomValues(const QDeclarativeScriptString &custom
     Set the template \a oomAdjustment
 */
 
-void ProcessInfoTemplate::setOomAdjustment(const QDeclarativeScriptString &oomAdjustment)
+void ProcessInfoTemplate::setOomAdjustment(const QQmlScriptString &oomAdjustment)
 {
     setScriptString(ProcessInfoConstants::OomAdjustment, oomAdjustment);
     emit oomAdjustmentChanged();
@@ -384,39 +384,39 @@ ProcessInfo *ProcessInfoTemplate::createProcessInfo(const QVariantMap &dict)
     Return the script string bound to \a name
  */
 
-QDeclarativeScriptString ProcessInfoTemplate::scriptString(const QString &name) const
+QQmlScriptString ProcessInfoTemplate::scriptString(const QString &name) const
 {
     QVariant var = m_templateData.value(name);
-    if (var.canConvert<QDeclarativeScriptString>())
-        return var.value<QDeclarativeScriptString>();
+    if (var.canConvert<QQmlScriptString>())
+        return var.value<QQmlScriptString>();
     else
-        return QDeclarativeScriptString();
+        return QQmlScriptString();
 }
 
 /*!
   Set the script string \a script to value \a name
  */
 
-void ProcessInfoTemplate::setScriptString(const QString &name, const QDeclarativeScriptString &script)
+void ProcessInfoTemplate::setScriptString(const QString &name, const QQmlScriptString &script)
 {
-    m_templateData.insert(name, QVariant::fromValue<QDeclarativeScriptString>(script));
+    m_templateData.insert(name, QVariant::fromValue<QQmlScriptString>(script));
 }
 
 /*!
   Returns the evaluated expression using \a script data.
  */
 
-QVariant ProcessInfoTemplate::bindScript(const QDeclarativeScriptString &script)
+QVariant ProcessInfoTemplate::bindScript(const QQmlScriptString &script)
 {
     if (script.context() && !script.script().isEmpty()) {
-        // This is necessary because QDeclarativeExpression tries to return any JS array script
+        // This is necessary because QQmlExpression tries to return any JS array script
         // as a QList<QObject *>, and that type is not useful to us (the returned JS array will
         // only contain null values.  So we wrap everything in a simple JSON object, and then pick
         // out the real value after evaluating it.
 
         QString scriptStr = QStringLiteral("script");
         QString jsonWrapper = QString::fromUtf8("{\"%1\": %2}").arg(scriptStr).arg(script.script());
-        QDeclarativeExpression expr(script.context(), this, jsonWrapper);
+        QQmlExpression expr(script.context(), this, jsonWrapper);
 
         return expr.evaluate().toMap().value(scriptStr);
     }
@@ -477,8 +477,8 @@ QVariantMap ProcessInfoTemplate::bindData(const QVariantMap &dict)
     while (it.hasNext()) {
         it.next();
         QVariant value = it.value();
-        if (value.canConvert<QDeclarativeScriptString>()) {
-            boundData.insert(it.key(), bindScript(value.value<QDeclarativeScriptString>()));
+        if (value.canConvert<QQmlScriptString>()) {
+            boundData.insert(it.key(), bindScript(value.value<QQmlScriptString>()));
         } else {
             boundData.insert(it.key(), value.toString());
         }
diff --git a/src/declarative/processinfotemplate.h b/src/declarative/processinfotemplate.h
index 8c88d10..fe35d01 100644
--- a/src/declarative/processinfotemplate.h
+++ b/src/declarative/processinfotemplate.h
@@ -43,7 +43,7 @@
 #include <QObject>
 #include <QVariant>
 #include <QVariantMap>
-#include <QtDeclarative/QDeclarativeScriptString>
+#include <QtQml/QQmlScriptString>
 
 #include "processmanager-global.h"
 
@@ -56,30 +56,30 @@ class Q_ADDON_PROCESSMANAGER_EXPORT ProcessInfoTemplate : public QObject
     Q_OBJECT
 
     Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier NOTIFY identifierChanged)
-    Q_PROPERTY(QDeclarativeScriptString programName READ programName WRITE setProgramName NOTIFY programNameChanged)
-    Q_PROPERTY(QDeclarativeScriptString uid READ uid WRITE setUid NOTIFY uidChanged)
-    Q_PROPERTY(QDeclarativeScriptString gid READ gid WRITE setGid NOTIFY gidChanged)
-    Q_PROPERTY(QDeclarativeScriptString workingDirectory READ workingDirectory WRITE setWorkingDirectory NOTIFY workingDirectoryChanged)
-    Q_PROPERTY(QDeclarativeScriptString environment READ environment WRITE setEnvironment NOTIFY environmentChanged)
-    Q_PROPERTY(QDeclarativeScriptString arguments READ arguments WRITE setArguments NOTIFY argumentsChanged)
-    Q_PROPERTY(QDeclarativeScriptString startOutputPattern READ startOutputPattern WRITE setStartOutputPattern NOTIFY startOutputPatternChanged)
-    Q_PROPERTY(QDeclarativeScriptString priority READ priority WRITE setPriority NOTIFY priorityChanged)
-    Q_PROPERTY(QDeclarativeScriptString customValues READ customValues WRITE setCustomValues NOTIFY customValuesChanged)
-    Q_PROPERTY(QDeclarativeScriptString oomAdjustment READ oomAdjustment WRITE setOomAdjustment NOTIFY oomAdjustmentChanged)
+    Q_PROPERTY(QQmlScriptString programName READ programName WRITE setProgramName NOTIFY programNameChanged)
+    Q_PROPERTY(QQmlScriptString uid READ uid WRITE setUid NOTIFY uidChanged)
+    Q_PROPERTY(QQmlScriptString gid READ gid WRITE setGid NOTIFY gidChanged)
+    Q_PROPERTY(QQmlScriptString workingDirectory READ workingDirectory WRITE setWorkingDirectory NOTIFY workingDirectoryChanged)
+    Q_PROPERTY(QQmlScriptString environment READ environment WRITE setEnvironment NOTIFY environmentChanged)
+    Q_PROPERTY(QQmlScriptString arguments READ arguments WRITE setArguments NOTIFY argumentsChanged)
+    Q_PROPERTY(QQmlScriptString startOutputPattern READ startOutputPattern WRITE setStartOutputPattern NOTIFY startOutputPatternChanged)
+    Q_PROPERTY(QQmlScriptString priority READ priority WRITE setPriority NOTIFY priorityChanged)
+    Q_PROPERTY(QQmlScriptString customValues READ customValues WRITE setCustomValues NOTIFY customValuesChanged)
+    Q_PROPERTY(QQmlScriptString oomAdjustment READ oomAdjustment WRITE setOomAdjustment NOTIFY oomAdjustmentChanged)
 public:
     ProcessInfoTemplate(QObject *parent = 0);
 
     QString identifier() const;
-    QDeclarativeScriptString programName() const;
-    QDeclarativeScriptString uid() const;
-    QDeclarativeScriptString gid() const;
-    QDeclarativeScriptString workingDirectory() const;
-    QDeclarativeScriptString environment() const;
-    QDeclarativeScriptString arguments() const;
-    QDeclarativeScriptString startOutputPattern() const;
-    QDeclarativeScriptString priority() const;
-    QDeclarativeScriptString customValues() const;
-    QDeclarativeScriptString oomAdjustment() const;
+    QQmlScriptString programName() const;
+    QQmlScriptString uid() const;
+    QQmlScriptString gid() const;
+    QQmlScriptString workingDirectory() const;
+    QQmlScriptString environment() const;
+    QQmlScriptString arguments() const;
+    QQmlScriptString startOutputPattern() const;
+    QQmlScriptString priority() const;
+    QQmlScriptString customValues() const;
+    QQmlScriptString oomAdjustment() const;
 
     Q_INVOKABLE virtual ProcessInfo *createProcessInfo(const QVariantMap &dict);
 
@@ -90,16 +90,16 @@ public:
 
 public slots:
     void setIdentifier(const QString &identifier);
-    void setProgramName(const QDeclarativeScriptString &programName);
-    void setUid(const QDeclarativeScriptString &uid);
-    void setGid(const QDeclarativeScriptString &gid);
-    void setWorkingDirectory(const QDeclarativeScriptString &dir);
-    void setEnvironment(QDeclarativeScriptString env);
-    void setArguments(const QDeclarativeScriptString &args);
-    void setStartOutputPattern(const QDeclarativeScriptString &startOutputPattern);
-    void setPriority(const QDeclarativeScriptString &value);
-    void setCustomValues(const QDeclarativeScriptString &vals);
-    void setOomAdjustment(const QDeclarativeScriptString &vals);
+    void setProgramName(const QQmlScriptString &programName);
+    void setUid(const QQmlScriptString &uid);
+    void setGid(const QQmlScriptString &gid);
+    void setWorkingDirectory(const QQmlScriptString &dir);
+    void setEnvironment(QQmlScriptString env);
+    void setArguments(const QQmlScriptString &args);
+    void setStartOutputPattern(const QQmlScriptString &startOutputPattern);
+    void setPriority(const QQmlScriptString &value);
+    void setCustomValues(const QQmlScriptString &vals);
+    void setOomAdjustment(const QQmlScriptString &vals);
 
 signals:
     void identifierChanged();
@@ -117,10 +117,10 @@ signals:
 protected:
     virtual QVariantMap bindData(const QVariantMap &dict);
 
-    QDeclarativeScriptString scriptString(const QString &name) const;
-    void setScriptString(const QString &name, const QDeclarativeScriptString &script);
+    QQmlScriptString scriptString(const QString &name) const;
+    void setScriptString(const QString &name, const QQmlScriptString &script);
 
-    QVariant bindScript(const QDeclarativeScriptString &script);
+    QVariant bindScript(const QQmlScriptString &script);
     Q_INVOKABLE QVariant bindValue(const QString &name);
     Q_INVOKABLE void setDict(const QVariantMap &dict);