diff options
| author | hjk <qtc-committer@nokia.com> | 2009-02-19 11:31:12 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-02-19 11:31:12 +0100 |
| commit | 7708d43f233cf15b41ef2690d3795d4cd4649ff7 (patch) | |
| tree | 20ebbf3950be79f82c0ff198cbada1358b41f7ef | |
| parent | a8300b3f59e0f8306401c84e68a351471a3cfa62 (diff) | |
Fixes: compile creator with QT_NO_CAST_FROM_BYTEARRAY
| -rw-r--r-- | src/plugins/debugger/debugger.pro | 3 | ||||
| -rw-r--r-- | src/qworkbench.pri | 3 | ||||
| -rw-r--r-- | src/shared/cpaster/cgi.cpp | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index 7ae85035ae8..0d1b11e1888 100644 --- a/src/plugins/debugger/debugger.pro +++ b/src/plugins/debugger/debugger.pro @@ -10,9 +10,6 @@ include(../../plugins/texteditor/texteditor.pri) include(../../plugins/cpptools/cpptools.pri) include(../../libs/cplusplus/cplusplus.pri) -# DEFINES += QT_NO_CAST_FROM_ASCII -DEFINES += QT_NO_CAST_TO_ASCII - QT += gui network script HEADERS += attachexternaldialog.h \ diff --git a/src/qworkbench.pri b/src/qworkbench.pri index 296e2170b3d..353846c6908 100644 --- a/src/qworkbench.pri +++ b/src/qworkbench.pri @@ -40,6 +40,9 @@ DEPENDPATH += \ LIBS += -L$$IDE_LIBRARY_PATH +# DEFINES += QT_NO_CAST_FROM_ASCII +DEFINES += QT_NO_CAST_TO_ASCII + unix { debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared release:OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp index fddbbc18a28..604c09e321e 100644 --- a/src/shared/cpaster/cgi.cpp +++ b/src/shared/cpaster/cgi.cpp @@ -112,7 +112,12 @@ QString CGI::decodeURL(const QString &urlText) dec.append(' '); break; 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; } ++it; |