diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 13:11:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-22 06:46:11 +0000 |
| commit | 89c2b2cd327a1f929924265622c80e22719998d4 (patch) | |
| tree | f82627aa19cda9735b6e692e938de3f00e82fb0b /src/app/app.pro | |
| parent | 03acd1fbf3748d02ac0f640053df6c8df964db7f (diff) | |
Support make install also on OS X
It can be helpful, is not much effort, and parts did not restrict the
install target to non-OS X already.
Change-Id: I3501f37f089e981cf3f72d9250c9b9161d1565d6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/app/app.pro')
| -rw-r--r-- | src/app/app.pro | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index 7ae24c943f..b86678ae16 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -2,7 +2,7 @@ include(../../qtcreator.pri) include(../shared/qtsingleapplication/qtsingleapplication.pri) TEMPLATE = app -CONFIG += qtc_runnable +CONFIG += qtc_runnable sliced_bundle TARGET = $$IDE_APP_TARGET DESTDIR = $$IDE_APP_PATH VERSION = $$QTCREATOR_VERSION @@ -21,8 +21,6 @@ QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH) } win32 { RC_FILE = qtcreator.rc - target.path = $$INSTALL_BIN_PATH - INSTALLS += target } else:macx { LIBS += -framework CoreFoundation ASSETCATALOG.files = $$PWD/qtcreator.xcassets @@ -40,13 +38,20 @@ win32 { ASSETCATALOG.input = ASSETCATALOG.files ASSETCATALOG.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += ASSETCATALOG + icns.files = \ + $$IDE_DATA_PATH/qtcreator.icns \ + $$IDE_DATA_PATH/prifile.icns \ + $$IDE_DATA_PATH/profile.icns + icns.path = $$INSTALL_DATA_PATH + icns.CONFIG += no_check_exist + INSTALLS += icns } QMAKE_INFO_PLIST = Info.plist -} else { - target.path = $$INSTALL_BIN_PATH - INSTALLS += target } +target.path = $$INSTALL_APP_PATH +INSTALLS += target + DISTFILES += qtcreator.rc \ Info.plist \ $$PWD/app_version.h.in |