From 1c27e120e23f9bc500474adc0e029bfc70a9f2cf Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 26 Nov 2012 20:43:53 +0200 Subject: [PATCH] ImageViewer: Compile with QT_NO_CAST_FROM_ASCII Change-Id: Ic5d255095f29b26a5b3567a95a30e987fd763f9a Reviewed-by: Friedemann Kleint --- src/plugins/imageviewer/imageviewer.cpp | 12 ++++++------ src/plugins/imageviewer/imageviewer.pro | 2 ++ src/plugins/imageviewer/imageviewer.qbs | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index aeb99f95bfd..f2a994e8479 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -73,15 +73,15 @@ ImageViewer::ImageViewer(QWidget *parent) d->ui_toolbar.setupUi(d->toolbar); // icons update - try to use system theme - updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, "zoom-in"); - updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, "zoom-out"); - updateButtonIconByTheme(d->ui_toolbar.toolButtonOriginalSize, "zoom-original"); - updateButtonIconByTheme(d->ui_toolbar.toolButtonFitToScreen, "zoom-fit-best"); + updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in")); + updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out")); + updateButtonIconByTheme(d->ui_toolbar.toolButtonOriginalSize, QLatin1String("zoom-original")); + updateButtonIconByTheme(d->ui_toolbar.toolButtonFitToScreen, QLatin1String("zoom-fit-best")); // a display - something is on the background - updateButtonIconByTheme(d->ui_toolbar.toolButtonBackground, "video-display"); + updateButtonIconByTheme(d->ui_toolbar.toolButtonBackground, QLatin1String("video-display")); // "emblem to specify the directory where the user stores photographs" // (photograph has outline - piece of paper) - updateButtonIconByTheme(d->ui_toolbar.toolButtonOutline, "emblem-photos"); + updateButtonIconByTheme(d->ui_toolbar.toolButtonOutline, QLatin1String("emblem-photos")); d->ui_toolbar.toolButtonZoomIn->setCommandId(Constants::ACTION_ZOOM_IN); d->ui_toolbar.toolButtonZoomOut->setCommandId(Constants::ACTION_ZOOM_OUT); diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro index b674eb4ffe0..6a0fbf40a1e 100644 --- a/src/plugins/imageviewer/imageviewer.pro +++ b/src/plugins/imageviewer/imageviewer.pro @@ -3,6 +3,8 @@ TARGET = ImageViewer include(../../qtcreatorplugin.pri) include(imageviewer_dependencies.pri) +DEFINES += QT_NO_CAST_FROM_ASCII + HEADERS += \ imageviewerplugin.h \ imageviewerfactory.h \ diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs index 79e5528baa4..22edd46499f 100644 --- a/src/plugins/imageviewer/imageviewer.qbs +++ b/src/plugins/imageviewer/imageviewer.qbs @@ -5,8 +5,10 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "ImageViewer" + Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["widgets", "svg"] } Depends { name: "Core" } + cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"]) files: [ "ImageViewer.mimetypes.xml",