From 7426399aa28e30e7a2abf1ddc1819e38e8fa6771 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 17 Oct 2020 03:41:28 +0200 Subject: [PATCH] Enable thumbbar for debug build --- src/CMakeLists.txt | 6 +++--- src/core/mainwindow.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 547bbb0f5..1613eb98b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -890,9 +890,9 @@ optional_source(WIN32 SOURCES engine/directsounddevicefinder.cpp engine/mmdevicefinder.cpp - #core/windows7thumbbar.cpp - #HEADERS - #core/windows7thumbbar.h + core/windows7thumbbar.cpp + HEADERS + core/windows7thumbbar.h ) optional_source(HAVE_SUBSONIC diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index b47f10c42..3767fcced 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -193,7 +193,7 @@ #include "smartplaylists/smartplaylistsviewcontainer.h" #include "smartplaylists/smartplaylistsview.h" -#if 0 +#if defined(Q_OS_WIN) && defined(DEBUG) # include "windows7thumbbar.h" #endif @@ -216,7 +216,7 @@ const int kTrackPositionUpdateTimeMs = 1000; MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSDBase *osd, const CommandlineOptions &options, QWidget *parent) : QMainWindow(parent), ui_(new Ui_MainWindow), -#if 0 +#if defined(Q_OS_WIN) && defined(DEBUG) thumbbar_(new Windows7ThumbBar(this)), #endif app_(app), @@ -751,7 +751,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSDBase *osd } // Windows 7 thumbbar buttons -#if 0 +#if defined(Q_OS_WIN) && defined(DEBUG) thumbbar_->SetActions(QList() << ui_->action_previous_track << ui_->action_play_pause << ui_->action_stop << ui_->action_next_track << nullptr << ui_->action_love); #endif @@ -2752,7 +2752,7 @@ bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *r Q_UNUSED(eventType); Q_UNUSED(result); -#if 0 +#if defined(Q_OS_WIN) && defined(DEBUG) MSG *msg = static_cast(message); thumbbar_->HandleWinEvent(msg); #else