diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-09-26 15:08:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-09-26 15:43:37 +0200 |
| commit | 455d597ac3cb6f1f6e1cc500c0a009df12cb4fcc (patch) | |
| tree | 1c570139de5bdbbc753823b88d36bd8454f4b770 /dist/installer | |
| parent | 696b0a8b8039e7d920f0daad967b51f179db60d4 (diff) | |
Fix deploying Qt on Mac (qt quick imports)
Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt
Quick 2 imports.
Also make qmlpuppet (Qt Quick 1) optional for deploying Qt.
Task-number: QTBUG-33545
Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'dist/installer')
| -rw-r--r-- | dist/installer/mac/qt.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/installer/mac/qt.conf b/dist/installer/mac/qt.conf new file mode 100644 index 0000000000..8083c02061 --- /dev/null +++ b/dist/installer/mac/qt.conf @@ -0,0 +1,4 @@ +[Paths] +Imports = Imports/qtquick1 +Qml2Imports = Imports/qtquick2 +Plugins = PlugIns |