diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro index fab92816fc9..7227847c473 100644 --- a/src/plugins/locator/locator.pro +++ b/src/plugins/locator/locator.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = Locator -DEFINES += LOCATOR_LIBRARY +DEFINES += LOCATOR_LIBRARY QT_NO_CAST_FROM_ASCII include(../../qtcreatorplugin.pri) include(locator_dependencies.pri) HEADERS += locatorplugin.h \ diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs index af809cfd841..33380005a66 100644 --- a/src/plugins/locator/locator.qbs +++ b/src/plugins/locator/locator.qbs @@ -16,6 +16,7 @@ QtcPlugin { "codeassist" ]) + cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"]) files: [ "basefilefilter.cpp", "basefilefilter.h", diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 23807c64d51..4a72047f9cd 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -48,7 +48,7 @@ using namespace Locator::Internal; SettingsPage::SettingsPage(LocatorPlugin *plugin) : 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)); setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));