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

LanguageUtils: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I94f3825f586efc052e027fdc0d974e66d190ed57
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-02 21:44:49 +02:00
committed by Orgad Shaneh
parent adfb07d049
commit 71ce993cdb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/languageutils/componentversion.cpp
View File

@@ -76,7 +76,7 @@ bool ComponentVersion::isValid() const
QString ComponentVersion::toString() const QString ComponentVersion::toString() const
{ {
return QString("%1.%2").arg(QString::number(_major), return QString::fromLatin1("%1.%2").arg(QString::number(_major),
QString::number(_minor)); QString::number(_minor));
} }

2
src/libs/languageutils/languageutils.pro
View File

@@ -1,6 +1,6 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = LanguageUtils TARGET = LanguageUtils
DEFINES += QT_CREATOR DEFINES += QT_CREATOR QT_NO_CAST_FROM_ASCII
unix:QMAKE_CXXFLAGS_DEBUG += -O3 unix:QMAKE_CXXFLAGS_DEBUG += -O3

3
src/libs/languageutils/languageutils.qbs
View File

@@ -7,7 +7,8 @@ QtcLibrary {
cpp.includePaths: base.concat("../3rdparty/cplusplus") cpp.includePaths: base.concat("../3rdparty/cplusplus")
cpp.defines: base.concat([ cpp.defines: base.concat([
"QT_CREATOR", "QT_CREATOR",
"LANGUAGEUTILS_BUILD_DIR" "LANGUAGEUTILS_BUILD_DIR",
"QT_NO_CAST_FROM_ASCII"
]) ])
cpp.optimization: "fast" cpp.optimization: "fast"