diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-03-06 18:03:24 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-03-06 18:12:46 +0100 |
| commit | db486783a9eb6ac5e0faa9ff95016329d307210b (patch) | |
| tree | cab22a36df17b164329e252b92b17c3fe61e056c | |
| parent | 8d536c3348a05a55d0205454f3064662a49ac319 (diff) | |
QmlDesigner: compile fix for share qmlpuppet and Qt 5.1
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
This ensures that QWeakPointer(const QObject *other)
does not get ambiguous with Qt 5.1.
Change-Id: I4801dbbc0ca4a3779b06d388f6a4251399f3e14b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro index de16677d87..9ac219436b 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro @@ -9,4 +9,8 @@ build_all:!build_pass { CONFIG += release } -include(../../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri)
\ No newline at end of file +greaterThan(QT_MAJOR_VERSION, 4) { + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900 +} + +include(qmlpuppet.pri)
\ No newline at end of file |