diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-13 15:44:14 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-19 17:37:49 +0100 |
| commit | be3a2bf91bfa83b14787a32ec5ebdd273afb01d8 (patch) | |
| tree | 7c27f967ff5d0db50596f9210dc9f59281208952 /src/declarative/qml/qdeclarativeimport.cpp | |
| parent | 8c0374357b4657256aa91e503577445c98d77e1a (diff) | |
Move the Qt Quick 1 imports back to "imports"
The Qt Quick 2 ones will be in a different place. This restores Qt 4
behaviour.
Change-Id: I6bc11113c0c89f4b11422b7fe98571930eb852cd
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007011.html
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 6d3ae0be..20331786 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -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("/QtDeclarative"); + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); addImportPath(installImportsPath); |