From a0d02f51790a97c44469eee126c553e5dfbcf091 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 5 Mar 2011 09:52:41 +0100 Subject: [PATCH] W7Taskabr support turned on only with W7TASKBAR define --- src/3rdparty/ecwin7.cpp | 2 +- src/3rdparty/ecwin7.h | 2 +- src/downloads/downloadmanager.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/ecwin7.cpp b/src/3rdparty/ecwin7.cpp index 76755444b..e7f91fe91 100644 --- a/src/3rdparty/ecwin7.cpp +++ b/src/3rdparty/ecwin7.cpp @@ -20,7 +20,7 @@ #include "ecwin7.h" // Windows only definitions -#ifdef Q_WS_WIN +#ifdef W7TASKBAR DEFINE_GUID(CLSID_TaskbarList,0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x0,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(IID_ITaskbarList3,0xea1afb91,0x9e28,0x4b86,0x90,0xE9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf); diff --git a/src/3rdparty/ecwin7.h b/src/3rdparty/ecwin7.h index 1359143e9..6877faf22 100644 --- a/src/3rdparty/ecwin7.h +++ b/src/3rdparty/ecwin7.h @@ -24,7 +24,7 @@ #include // Windows only data definitions -#ifdef Q_WS_WIN +#ifdef W7TASKBAR #include #include diff --git a/src/downloads/downloadmanager.h b/src/downloads/downloadmanager.h index 3e2691cbe..ec03e3271 100644 --- a/src/downloads/downloadmanager.h +++ b/src/downloads/downloadmanager.h @@ -62,7 +62,7 @@ public: void show() { m_timer.start(1000*2, this); QWidget::show(); } -#ifdef Q_WS_WIN +#ifdef W7TASKBAR protected: virtual bool winEvent(MSG *message, long *result); #endif @@ -72,7 +72,7 @@ private slots: void deleteItem(DownloadItem* item); private: -#ifdef Q_WS_WIN +#ifdef W7TASKBAR EcWin7 win7; #endif void timerEvent(QTimerEvent *event);