diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-15 15:58:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 17:18:22 +0200 |
| commit | 79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch) | |
| tree | 2bf779aff001b7e9675f52ccb270a0041de06b62 /src/imports/webview | |
| parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) | |
Rename the QtQuick1 module back to QtDeclarative
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/imports/webview')
| -rw-r--r-- | src/imports/webview/webview.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index 9ed375db..e46d9efe 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -2,14 +2,14 @@ TARGET = qmlwebkitplugin TARGETPATH = QtQuick1/QtWebKit include(../qimportbase.pri) -QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private webkit +QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkit SOURCES += qdeclarativewebview.cpp plugin.cpp HEADERS += qdeclarativewebview_p.h OTHER_FILES += plugin.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir |