forked from qt-creator/qt-creator
UpdateInfo: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I3e25a0318a23970246ddcef0db458730e0cc6c81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
committed by
Friedemann Kleint
parent
1c27e120e2
commit
d74784fab6
@@ -2,6 +2,8 @@ TARGET = UpdateInfo
|
||||
TEMPLATE = lib
|
||||
QT += network xml
|
||||
|
||||
DEFINES += QT_NO_CAST_FROM_ASCII
|
||||
|
||||
HEADERS += updateinfoplugin.h \
|
||||
updateinfobutton.h
|
||||
SOURCES += updateinfoplugin.cpp \
|
||||
|
||||
@@ -5,6 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
|
||||
QtcPlugin {
|
||||
name: "UpdateInfo"
|
||||
|
||||
Depends { name: "cpp" }
|
||||
Depends { name: "Core" }
|
||||
Depends { name: "ExtensionSystem" }
|
||||
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
|
||||
@@ -16,6 +17,7 @@ QtcPlugin {
|
||||
"..",
|
||||
buildDirectory,
|
||||
]
|
||||
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
|
||||
|
||||
files: [
|
||||
"updateinfobutton.cpp",
|
||||
|
||||
@@ -166,7 +166,7 @@ QDomDocument UpdateInfoPlugin::checkForUpdates()
|
||||
qWarning() << "Get update info application crashed.";
|
||||
//return; //maybe there is some output
|
||||
}
|
||||
QString updaterOutput = updaterProcess.readAllStandardOutput();
|
||||
QByteArray updaterOutput = updaterProcess.readAllStandardOutput();
|
||||
QDomDocument updatesDomDocument;
|
||||
updatesDomDocument.setContent(updaterOutput);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user