Commit db486783 authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

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: default avatarMarco Bubke <marco.bubke@digia.com>
parent 8d536c33
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment