diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro index fab92816fc95ae116fbbb6906ff1213fda0e51f8..7227847c4733d3faebe10dde53ef590e7be8ca5b 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 af809cfd841e330c85b7e94c9a2ad78bced6a6f9..33380005a66ed16b7c77c1c571bffc5cab8befe7 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 23807c64d51d1a72702550ff8b85b78032029b63..4a72047f9cdcbd305d26b9b5c24316a94124a004 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));