diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/jsondb-client/client.cpp | 8 | ||||
-rw-r--r-- | tools/jsondb-client/client.h | 4 | ||||
-rw-r--r-- | tools/jsondb-client/jsondb-client.pro | 2 | ||||
-rw-r--r-- | tools/jsondb-client/main.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/jsondb-client/client.cpp b/tools/jsondb-client/client.cpp index 08135fc2..b3459340 100644 --- a/tools/jsondb-client/client.cpp +++ b/tools/jsondb-client/client.cpp @@ -48,8 +48,8 @@ #include <sstream> #include <iomanip> -#include <QDeclarativeComponent> -#include <QDeclarativeEngine> +#include <QQmlComponent> +#include <QQmlEngine> QT_USE_NAMESPACE @@ -669,12 +669,12 @@ void Client::loadQmlFile(const QString &qmlFile) } if (!mEngine) { - mEngine = new QDeclarativeEngine(this); + mEngine = new QQmlEngine(this); connect(mEngine, SIGNAL(quit()), this, SLOT(fileLoadSuccess())); } qml.open(QFile::ReadOnly); - QDeclarativeComponent *component = new QDeclarativeComponent(mEngine, this); + QQmlComponent *component = new QQmlComponent(mEngine, this); component->setData(qml.readAll(), QUrl()); qml.close(); diff --git a/tools/jsondb-client/client.h b/tools/jsondb-client/client.h index 24e48b63..f12cfa8d 100644 --- a/tools/jsondb-client/client.h +++ b/tools/jsondb-client/client.h @@ -48,7 +48,7 @@ #include <histedit.h> QT_BEGIN_NAMESPACE -class QDeclarativeEngine; +class QQmlEngine; QT_END_NAMESPACE class InputThread : public QThread { @@ -128,7 +128,7 @@ private: bool mTerminate; bool mDebug; QStringList mFilesToLoad; - QDeclarativeEngine *mEngine; + QQmlEngine *mEngine; }; diff --git a/tools/jsondb-client/jsondb-client.pro b/tools/jsondb-client/jsondb-client.pro index e529a98d..2b6e6cb5 100644 --- a/tools/jsondb-client/jsondb-client.pro +++ b/tools/jsondb-client/jsondb-client.pro @@ -4,7 +4,7 @@ DESTDIR = $$QT.jsondb.bins target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target -QT = core jsondb declarative gui +QT = core jsondb qml gui LIBS += -ledit diff --git a/tools/jsondb-client/main.cpp b/tools/jsondb-client/main.cpp index aa575aba..1a1867f1 100644 --- a/tools/jsondb-client/main.cpp +++ b/tools/jsondb-client/main.cpp @@ -62,7 +62,7 @@ static void usage(const QString &name, int exitCode = 0) int main(int argc, char * argv[]) { // Hack to avoid making people specify a platform plugin. - // We only need QGuiApplication so that we can use QDeclarativeEngine. + // We only need QGuiApplication so that we can use QQmlEngine. bool platformSpecified = false; for (int i = 0; i < argc; i++) { if (strcmp(argv[i], "-platform") == 0) |