forked from qt-creator/qt-creator
Fixes: compile creator with QT_NO_CAST_FROM_BYTEARRAY
This commit is contained in:
@@ -10,9 +10,6 @@ include(../../plugins/texteditor/texteditor.pri)
|
|||||||
include(../../plugins/cpptools/cpptools.pri)
|
include(../../plugins/cpptools/cpptools.pri)
|
||||||
include(../../libs/cplusplus/cplusplus.pri)
|
include(../../libs/cplusplus/cplusplus.pri)
|
||||||
|
|
||||||
# DEFINES += QT_NO_CAST_FROM_ASCII
|
|
||||||
DEFINES += QT_NO_CAST_TO_ASCII
|
|
||||||
|
|
||||||
QT += gui network script
|
QT += gui network script
|
||||||
|
|
||||||
HEADERS += attachexternaldialog.h \
|
HEADERS += attachexternaldialog.h \
|
||||||
|
@@ -40,6 +40,9 @@ DEPENDPATH += \
|
|||||||
|
|
||||||
LIBS += -L$$IDE_LIBRARY_PATH
|
LIBS += -L$$IDE_LIBRARY_PATH
|
||||||
|
|
||||||
|
# DEFINES += QT_NO_CAST_FROM_ASCII
|
||||||
|
DEFINES += QT_NO_CAST_TO_ASCII
|
||||||
|
|
||||||
unix {
|
unix {
|
||||||
debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
|
debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
|
||||||
release:OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared
|
release:OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared
|
||||||
|
@@ -112,7 +112,12 @@ QString CGI::decodeURL(const QString &urlText)
|
|||||||
dec.append(' ');
|
dec.append(' ');
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dec.append(*it);
|
if (ch < 256) {
|
||||||
|
dec.append(ch);
|
||||||
|
} else {
|
||||||
|
// should not happen with proper URLs but stay on the safe side
|
||||||
|
dec.append(QString(*it).toUtf8());
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
++it;
|
++it;
|
||||||
|
Reference in New Issue
Block a user