diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 11:37:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 13:15:58 +0100 |
| commit | ba35765c2217c987c8f4d34a0494854055251425 (patch) | |
| tree | 92c232c6602f1fcc6f8ffe2548dfae3d05b1dec5 | |
| parent | dec729066c60d99469a61f012e1fdcefdeab217e (diff) | |
| parent | 7e4d555a4c907302d58c56c75ba415c350599911 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ied106082426a42c3ee0877f1916046ffbf3f3c81
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | demos/qtdemo/qtdemo.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 42ba8e45f..a5c6224fb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,3 @@ load(qt_build_config) + +MODULE_VERSION = 5.0.2 diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro index 42704e487..adf636014 100644 --- a/demos/qtdemo/qtdemo.pro +++ b/demos/qtdemo/qtdemo.pro @@ -11,7 +11,7 @@ qtHaveModule(opengl) { QT += opengl } -contains(QT_CONFIG, quick1) { +qtHaveModule(quick1) { QT += quick1 } else { DEFINES *= QT_NO_DECLARATIVE |