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

Locator: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: Ib20a50bf6989ff4b8c5fe4073dac0d22ed1d6f55
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-21 22:39:02 +02:00
committed by Friedemann Kleint
parent 7fa69afa6c
commit cdf5a10d4e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = Locator TARGET = Locator
DEFINES += LOCATOR_LIBRARY DEFINES += LOCATOR_LIBRARY QT_NO_CAST_FROM_ASCII
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(locator_dependencies.pri) include(locator_dependencies.pri)
HEADERS += locatorplugin.h \ HEADERS += locatorplugin.h \

1
src/plugins/locator/locator.qbs
View File

@@ -16,6 +16,7 @@ QtcPlugin {
"codeassist" "codeassist"
]) ])
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
files: [ files: [
"basefilefilter.cpp", "basefilefilter.cpp",
"basefilefilter.h", "basefilefilter.h",

2
src/plugins/locator/settingspage.cpp
View File

@@ -48,7 +48,7 @@ using namespace Locator::Internal;
SettingsPage::SettingsPage(LocatorPlugin *plugin) SettingsPage::SettingsPage(LocatorPlugin *plugin)
: m_plugin(plugin), m_page(0) : m_plugin(plugin), m_page(0)
{ {
setId(Constants::FILTER_OPTIONS_PAGE); setId(QLatin1String(Constants::FILTER_OPTIONS_PAGE));
setDisplayName(QCoreApplication::translate("Locator", Locator::Constants::FILTER_OPTIONS_PAGE)); setDisplayName(QCoreApplication::translate("Locator", Locator::Constants::FILTER_OPTIONS_PAGE));
setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE)); setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE));
setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));