feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qml{puppet,designer} build without QT_RESTRICTED_CAST_FROM_ASCII

Browse Source 
Change-Id: I8499cbf2e2b1bbe844373cb8549f82b5d62c0053
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
hjk
2016-03-18 10:29:30 +01:00
parent 82a523f6b1
commit bf95512e5b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+1 -1
View File
@@ -20,7 +20,7 @@ QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
SOURCES += $$PWD/qml2puppetmain.cpp
RESOURCES += $$PWD/../qmlpuppet.qrc
DEFINES -= QT_NO_CAST_FROM_ASCII
DEFINES -= QT_RESTRICTED_CAST_FROM_ASCII
DISTFILES += Info.plist
src/plugins/qmldesigner/qmldesignerplugin.pro
+1 -1
View File
@@ -23,7 +23,7 @@ include(components/importmanager/importmanager.pri)
include(qmldesignerextension/qmldesignerextension.pri)
include(qmldesignerplugin.pri)
DEFINES -= QT_NO_CAST_FROM_ASCII
DEFINES -= QT_RESTRICTED_CAST_FROM_ASCII
BUILD_PUPPET_IN_CREATOR_BINPATH = $$(BUILD_PUPPET_IN_CREATOR_BINPATH)
!isEmpty(BUILD_PUPPET_IN_CREATOR_BINPATH) {