diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:43:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:43:33 +0200 |
| commit | bedc477943ba94c38db133b8cf6d20132d56a315 (patch) | |
| tree | ae64d44a5d12f66e07a0c2d963d885bcf0ceb5db /dist | |
| parent | 3aa0e500392192dc6306a29d4a60b4d362a29811 (diff) | |
| parent | 71f1919de9a1ce0abc370fb2a1044ad6e85438cf (diff) | |
| download | qt-creator-bedc477943ba94c38db133b8cf6d20132d56a315.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/mac/qmlpuppet_qt.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dist/installer/mac/qmlpuppet_qt.conf b/dist/installer/mac/qmlpuppet_qt.conf index 9298042e36..034fabe6f8 100644 --- a/dist/installer/mac/qmlpuppet_qt.conf +++ b/dist/installer/mac/qmlpuppet_qt.conf @@ -1,3 +1,4 @@ [Paths] -Imports = ../.. +Imports = ../../../Imports/qtquick1 +Qml2Imports = ../../../Imports/qtquick2 Plugins = ../../../PlugIns |