kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

make sure QWinTaskbarProgress and QWinTaskbarButton is only used in windows compiles

Browse Source
This commit is contained in:
MA-DEVELOP\apeltauer
2019-05-02 09:25:18 +02:00
committed by wmayer
parent 3f367f8292
commit 8644b61e32
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/ProgressBar.cpp
View File

@@ -335,9 +335,11 @@ QProgressBar* Sequencer::getProgressBar(QWidget* parent)
ProgressBar::ProgressBar (Sequencer* s, QWidget * parent)
: QProgressBar(parent), sequencer(s)
, m_taskbarButton(nullptr)
, m_taskbarProgress(nullptr)
{
#ifdef QT_WINEXTRAS_LIB
m_taskbarButton = nullptr;
m_taskbarButton = nullptr;
#endif
d = new Gui::ProgressBarPrivate;
d->minimumDuration = 2000; // 2 seconds
d->delayShowTimer = new QTimer(this);
@@ -464,7 +466,7 @@ bool Gui::ProgressBar::setupTaskBarProgress(void)
{
if (!m_taskbarButton || !m_taskbarProgress)
{
#if QT_VERSION >= 0x050000
#ifdef QT_WINEXTRAS_LIB
m_taskbarButton = new QWinTaskbarButton(this);
m_taskbarButton->setWindow(MainWindow::getInstance()->windowHandle());
//m_myButton->setOverlayIcon(QIcon(""));
@@ -472,7 +474,8 @@ bool Gui::ProgressBar::setupTaskBarProgress(void)
m_taskbarProgress = m_taskbarButton->progress();
m_taskbarProgress->setVisible(true);
return true;
#else
#endif
#ifndef QT_WINEXTRAS_LIB
return false;
#endif
}