diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-12-18 17:42:04 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-12-18 17:42:04 +0100 |
| commit | 03717cf7ef47113652688756b4ae2c759472213e (patch) | |
| tree | 0dcac515a424b1b48ea84edb5cc2536b9cbf7f60 /dist | |
| parent | aa0dc33d325cfd1bb0fce1c597cd851faebdab14 (diff) | |
| parent | 4510d1ef841a76aeca49c883bea9d516febd10c3 (diff) | |
| download | qt-creator-03717cf7ef47113652688756b4ae2c759472213e.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/debugger/gdb/gdboptionspage.cpp
src/plugins/fakevim/fakevimoptions.ui
src/share/share.qbs
Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/mac/qmlpuppet_qt.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/installer/mac/qmlpuppet_qt.conf b/dist/installer/mac/qmlpuppet_qt.conf index 34a32f6097..9298042e36 100644 --- a/dist/installer/mac/qmlpuppet_qt.conf +++ b/dist/installer/mac/qmlpuppet_qt.conf @@ -1,2 +1,3 @@ [Paths] Imports = ../.. +Plugins = ../../../PlugIns |