diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index 1a43be024051e3b03f4786863c15e72a847acf16..0256c8ad73dec757496fcec915218a372535ee25 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -57,7 +57,7 @@ DATA_DIRS = \ } } -unix:!macx { +!macx { for(data_dir, DATA_DIRS) { eval($${data_dir}.files = $$quote($$PWD/$$data_dir)) eval($${data_dir}.path = /share/qtcreator) diff --git a/src/app/app.pro b/src/app/app.pro index b1830edff2f7f9800b4a368463fae639f1085b76..932048f298ff00bd10c053bad8a195af1b2660e8 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -14,6 +14,8 @@ win32 { else:LIBS *= -lExtensionSystem -lAggregation RC_FILE = qtcreator.rc + target.path = /bin + INSTALLS += target } else:macx { CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug else:LIBS *= -lExtensionSystem -lAggregation diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri index ecfee84d112895ef37ac1f6a8d0c8fcbf40ce275..a1663e5b4c9b8bd8ab7d8f0f65d8fe90b74f3462 100644 --- a/src/qtcreatorlibrary.pri +++ b/src/qtcreatorlibrary.pri @@ -1,7 +1,7 @@ include(../qtcreator.pri) win32 { - DLLDESTDIR = $$IDE_APP_PATH + DLLDESTDIR = $$IDE_APP_PATH } DESTDIR = $$IDE_LIBRARY_PATH @@ -12,7 +12,12 @@ TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -unix:!macx { - target.path = /$$IDE_LIBRARY_BASENAME/qtcreator - INSTALLS += target +!macx { + win32 { + target.path = /bin + target.files = $$DESTDIR/$${TARGET}.dll + } else { + target.path = /$$IDE_LIBRARY_BASENAME/qtcreator + } + INSTALLS += target } diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 15c3f6019ec63fe2ea876837b835b62c296b2e01..7dbe5a87113e12e75921120730bdf9944273ae08 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -42,7 +42,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols CONFIG += plugin plugin_with_soname -unix:!macx { +!macx { target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER pluginspec.files += $${TARGET}.pluginspec pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER