diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
| commit | 4a826ada0486dd2c07b3932c6e62ad375f0edfbb (patch) | |
| tree | 39360b652210c9d92506fe0c0170f8e45a91b159 /src/plugins/imageviewer | |
| parent | 582c46d34f28f9e04af4d8179f455a603ded5ec7 (diff) | |
| parent | 427bb8c363fc3ee0d9c12ca7ac01d47dc0f6f8f4 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
Diffstat (limited to 'src/plugins/imageviewer')
| -rw-r--r-- | src/plugins/imageviewer/imageviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index f279125f38..f5e3cb503c 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -260,10 +260,10 @@ void ImageViewer::updatePauseAction() bool isMovie = d->file->type() == ImageViewerFile::TypeMovie; if (isMovie && !d->file->isPaused()) { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL.icon()); + d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); } else { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL.icon()); + d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon()); d->ui_toolbar.toolButtonPlayPause->setEnabled(isMovie); } } |