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/declarative/qml/qdeclarativeimport.cpp | |
parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) | |
download | qtquick1-79fed8757e26f946745eec9d8bba8b91aeb1a742.tar.gz |
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/declarative/qml/qdeclarativeimport.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 4d86a795..e51d2485 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -47,7 +47,7 @@ #include <QtCore/qpluginloader.h> #include <QtCore/qlibraryinfo.h> #include <QtCore/qalgorithms.h> -#include <QtQuick1/qdeclarativeextensioninterface.h> +#include <QtDeclarative/qdeclarativeextensioninterface.h> #include <private/qdeclarativeglobal_p.h> #include <private/qdeclarativetypenamecache_p.h> #include <private/qdeclarativeengine_p.h> @@ -708,7 +708,7 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtQuick1"); + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtDeclarative"); addImportPath(installImportsPath); |