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

UpdateInfo: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I3e25a0318a23970246ddcef0db458730e0cc6c81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 20:44:10 +02:00
committed by Friedemann Kleint
parent 1c27e120e2
commit d74784fab6
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/updateinfo/updateinfo.pro
View File

@@ -2,6 +2,8 @@ TARGET = UpdateInfo
TEMPLATE = lib TEMPLATE = lib
QT += network xml QT += network xml
DEFINES += QT_NO_CAST_FROM_ASCII
HEADERS += updateinfoplugin.h \ HEADERS += updateinfoplugin.h \
updateinfobutton.h updateinfobutton.h
SOURCES += updateinfoplugin.cpp \ SOURCES += updateinfoplugin.cpp \

2
src/plugins/updateinfo/updateinfo.qbs
View File

@@ -5,6 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "UpdateInfo" name: "UpdateInfo"
Depends { name: "cpp" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ExtensionSystem" } Depends { name: "ExtensionSystem" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
@@ -16,6 +17,7 @@ QtcPlugin {
"..", "..",
buildDirectory, buildDirectory,
] ]
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
files: [ files: [
"updateinfobutton.cpp", "updateinfobutton.cpp",

2
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -166,7 +166,7 @@ QDomDocument UpdateInfoPlugin::checkForUpdates()
qWarning() << "Get update info application crashed."; qWarning() << "Get update info application crashed.";
//return; //maybe there is some output //return; //maybe there is some output
} }
QString updaterOutput = updaterProcess.readAllStandardOutput(); QByteArray updaterOutput = updaterProcess.readAllStandardOutput();
QDomDocument updatesDomDocument; QDomDocument updatesDomDocument;
updatesDomDocument.setContent(updaterOutput); updatesDomDocument.setContent(updaterOutput);