diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-03-28 11:12:05 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2014-04-11 12:55:56 +0300 |
| commit | 743754a36d25c3f529603b1f404a131982c897f6 (patch) | |
| tree | 9e6701a267d322c489aecbb66c3fc665bc5a015f /demos | |
| parent | 1b2e5857f541f57351e8e7e692e579e8b5c663ac (diff) | |
Fix build for iOS and for building the QtQuick 2 plugin statically
When building statically then static will be set not staticlib, therefore
we need to ensure we check for static in those cases. And also protect
against Mac specific flags when building for iOS.
Task-number: QTRD-3036
Change-Id: Ib2c534974ad9292e3634b8b692344c71e26e56cd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/demos/demos.pri b/demos/demos.pri index 5f3df144..e96d687c 100644 --- a/demos/demos.pri +++ b/demos/demos.pri @@ -3,11 +3,12 @@ } DESTDIR = $$CHART_BUILD_BIN_DIR +!ios { OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET - +} TEMPLATE = app QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets |