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 | |
| 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')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 2 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/imports/shaders/shaders.pro | 2 | ||||
| -rw-r--r-- | src/imports/webview/webview.pro | 2 |
6 files changed, 6 insertions, 6 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); diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 32ecac61..f7fe4f3c 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,5 +1,5 @@ TARGET = qmlfolderlistmodelplugin -TARGETPATH = QtDeclarative/Qt/labs/folderlistmodel +TARGETPATH = Qt/labs/folderlistmodel include(../qimportbase.pri) QT += widgets declarative script diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 918f7a9a..e4ab655e 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -1,5 +1,5 @@ TARGET = qmlgesturesplugin -TARGETPATH = QtDeclarative/Qt/labs/gestures +TARGETPATH = Qt/labs/gestures include(../qimportbase.pri) QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 029d6595..67a3984f 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,5 +1,5 @@ TARGET = qmlparticlesplugin -TARGETPATH = QtDeclarative/Qt/labs/particles +TARGETPATH = Qt/labs/particles include(../qimportbase.pri) QT += declarative declarative-private core-private gui-private widgets-private diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index 16e8e536..64d965c7 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -1,5 +1,5 @@ TARGET = qmlshadersplugin -TARGETPATH = QtDeclarative/Qt/labs/shaders +TARGETPATH = Qt/labs/shaders include(../qimportbase.pri) QT += declarative widgets opengl diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index f64ed481..373163a3 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -1,5 +1,5 @@ TARGET = qmlwebkitplugin -TARGETPATH = QtQuick1/QtWebKit +TARGETPATH = QtWebKit include(../qimportbase.pri) QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkitwidgets |