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

ImageViewer: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: Ic5d255095f29b26a5b3567a95a30e987fd763f9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 20:43:53 +02:00
committed by Friedemann Kleint
parent e943fcb39f
commit 1c27e120e2
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/imageviewer/imageviewer.cpp
View File

@@ -73,15 +73,15 @@ ImageViewer::ImageViewer(QWidget *parent)
d->ui_toolbar.setupUi(d->toolbar); d->ui_toolbar.setupUi(d->toolbar);
// icons update - try to use system theme // icons update - try to use system theme
updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, "zoom-in"); updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, "zoom-out"); updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out"));
updateButtonIconByTheme(d->ui_toolbar.toolButtonOriginalSize, "zoom-original"); updateButtonIconByTheme(d->ui_toolbar.toolButtonOriginalSize, QLatin1String("zoom-original"));
updateButtonIconByTheme(d->ui_toolbar.toolButtonFitToScreen, "zoom-fit-best"); updateButtonIconByTheme(d->ui_toolbar.toolButtonFitToScreen, QLatin1String("zoom-fit-best"));
// a display - something is on the background // 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" // "emblem to specify the directory where the user stores photographs"
// (photograph has outline - piece of paper) // (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.toolButtonZoomIn->setCommandId(Constants::ACTION_ZOOM_IN);
d->ui_toolbar.toolButtonZoomOut->setCommandId(Constants::ACTION_ZOOM_OUT); d->ui_toolbar.toolButtonZoomOut->setCommandId(Constants::ACTION_ZOOM_OUT);

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

@@ -3,6 +3,8 @@ TARGET = ImageViewer
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(imageviewer_dependencies.pri) include(imageviewer_dependencies.pri)
DEFINES += QT_NO_CAST_FROM_ASCII
HEADERS += \ HEADERS += \
imageviewerplugin.h \ imageviewerplugin.h \
imageviewerfactory.h \ imageviewerfactory.h \

2
src/plugins/imageviewer/imageviewer.qbs
View File

@@ -5,8 +5,10 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "ImageViewer" name: "ImageViewer"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "svg"] } Depends { name: "Qt"; submodules: ["widgets", "svg"] }
Depends { name: "Core" } Depends { name: "Core" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
files: [ files: [
"ImageViewer.mimetypes.xml", "ImageViewer.mimetypes.xml",