diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-13 15:49:32 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-11 15:05:18 +0000 |
| commit | bef5bfe27bc4154cfc83150299d8b1df732f6bea (patch) | |
| tree | 6cf24d3e6d317a3a919ed7c0188d3ce1213c0e52 /src | |
| parent | 474af549e4fc8a662031ec87880a1ecb97da2154 (diff) | |
remove bogus gui dependency from macdeployqt
... and build it even when building with -nomake tools, like the other
*deployqt tools.
note that we still don't build it when cross-building for uikit,
because the bootstrapped host build does not work due to a QProcess
dependency. that's no loss, because all our uikit builds are currently
static, where this tool is pointless.
Task-number: QTBUG-58827
Change-Id: I8eda4a85716ceeb844a3e97f5f38d35868cffeef
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/macdeployqt/macchangeqt/macchangeqt.pro | 1 | ||||
| -rw-r--r-- | src/macdeployqt/macdeployqt/macdeployqt.pro | 1 | ||||
| -rw-r--r-- | src/src.pro | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/macdeployqt/macchangeqt/macchangeqt.pro b/src/macdeployqt/macchangeqt/macchangeqt.pro index 2eafd3e99..bf195f89a 100644 --- a/src/macdeployqt/macchangeqt/macchangeqt.pro +++ b/src/macdeployqt/macchangeqt/macchangeqt.pro @@ -1,4 +1,5 @@ SOURCES += main.cpp ../shared/shared.cpp +QT = core LIBS += -framework CoreFoundation load(qt_app) diff --git a/src/macdeployqt/macdeployqt/macdeployqt.pro b/src/macdeployqt/macdeployqt/macdeployqt.pro index 2eafd3e99..bf195f89a 100644 --- a/src/macdeployqt/macdeployqt/macdeployqt.pro +++ b/src/macdeployqt/macdeployqt/macdeployqt.pro @@ -1,4 +1,5 @@ SOURCES += main.cpp ../shared/shared.cpp +QT = core LIBS += -framework CoreFoundation load(qt_app) diff --git a/src/src.pro b/src/src.pro index 6525af678..3fc48db96 100644 --- a/src/src.pro +++ b/src/src.pro @@ -37,7 +37,6 @@ qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag qtNomakeTools( \ pixeltool \ - macdeployqt \ ) # This is necessary to avoid a race condition between toolchain.prf |