diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tools/qmlscene | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tools/qmlscene')
| -rw-r--r-- | tools/qmlscene/main.cpp | 18 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index d586131845..327dfc6889 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -47,10 +47,10 @@ #include <QtGui/QGuiApplication> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativecontext.h> +#include <QtQml/qqml.h> +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlcomponent.h> +#include <QtQml/qqmlcontext.h> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> @@ -308,7 +308,7 @@ static void displayFileDialog(Options *options) #endif } -static void loadDummyDataFiles(QDeclarativeEngine &engine, const QString& directory) +static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory) { QDir dir(directory+"/dummydata", "*.qml"); QStringList list = dir.entryList(); @@ -317,13 +317,13 @@ static void loadDummyDataFiles(QDeclarativeEngine &engine, const QString& direct QFile f(dir.filePath(qml)); f.open(QIODevice::ReadOnly); QByteArray data = f.readAll(); - QDeclarativeComponent comp(&engine); + QQmlComponent comp(&engine); comp.setData(data, QUrl()); QObject *dummyData = comp.create(); if(comp.isError()) { - QList<QDeclarativeError> errors = comp.errors(); - foreach (const QDeclarativeError &error, errors) { + QList<QQmlError> errors = comp.errors(); + foreach (const QQmlError &error, errors) { qWarning() << error; } } @@ -401,7 +401,7 @@ int main(int argc, char ** argv) #endif QWindow *window = 0; - QDeclarativeEngine *engine = 0; + QQmlEngine *engine = 0; int exitCode = 0; diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 5e4d79253e..392e607b88 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -1,8 +1,8 @@ TEMPLATE = app TARGET = qmlscene -DESTDIR= $$QT.declarative.bins +DESTDIR= $$QT.qml.bins -QT += declarative quick core-private +QT += qml quick core-private !isEmpty(QT.widgets.name): QT += widgets target.path = $$[QT_INSTALL_BINS] |