diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-06 09:46:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-06 09:52:22 +0200 |
| commit | ae3a833b8c4b4660deb43441ee117bcea42b3d36 (patch) | |
| tree | 0aeb7e73108cace498837c372464c70d432f6cc3 /src/qtcreatorplugin.pri | |
| parent | 3d4e508d0cf123e9566c6bd3892321a1a5e3556b (diff) | |
Commit things that went missing from 2a4a56b2beec7a3c0be94302146461d2f730315d
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 9a6bb8eb19..79fc1d7d51 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -10,13 +10,19 @@ isEmpty(PROVIDER) { isEmpty(USE_USER_DESTDIR) { DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER } else { - win32:DESTDIRBASE = "$$(LOCALAPPDATA)" - else:macx: DESTDIRBASE = "$$(HOME)/Library/Application Support" - else:unix { + win32 { + DESTDIRAPPNAME = "qtcreator" + DESTDIRBASE = "$$(LOCALAPPDATA)" + isEmpty(DESTDIRBASE):DESTDIRBASE="$$(USERPROFILE)\Local Settings\Application Data" + } else:macx { + DESTDIRAPPNAME = "Qt Creator" + DESTDIRBASE = "$$(HOME)/Library/Application Support" + } else:unix { + DESTDIRAPPNAME = "qtcreator" DESTDIRBASE = "$$(XDG_DATA_HOME)" isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share" } - DESTDIR = "$$DESTDIRBASE/Nokia/QtCreator/plugins/$$QTCREATOR_VERSION/$$PROVIDER" + DESTDIR = "$$DESTDIRBASE/Nokia/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER" } LIBS += -L$$DESTDIR |