diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-03-26 15:43:38 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-03-26 15:43:38 +0000 |
| commit | 4db8d20982b9d5dc6d36e798cd5742ee44e17e1a (patch) | |
| tree | fdd1d4919f5358b9c949fc33db56eba732d35b91 | |
| parent | 5a581e577a888eeb61d89a9b9936b08189655275 (diff) | |
| download | qmmp-4db8d20982b9d5dc6d36e798cd5742ee44e17e1a.tar.gz qmmp-4db8d20982b9d5dc6d36e798cd5742ee44e17e1a.tar.bz2 qmmp-4db8d20982b9d5dc6d36e798cd5742ee44e17e1a.zip | |
skinned: fixed Qt 5.5 support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9315 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Ui/skinned/dock.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/eqpreset.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/preseteditor.cpp | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp index 7224adf1d..f403cdec5 100644 --- a/src/plugins/Ui/skinned/dock.cpp +++ b/src/plugins/Ui/skinned/dock.cpp @@ -23,6 +23,9 @@ #include <QWindow> #include <QtDebug> #include <QApplication> +#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0)) //qAsConst template +#include <qmmp/qmmp.h> +#endif #include "dock.h" Dock *Dock::m_instance = nullptr; diff --git a/src/plugins/Ui/skinned/eqpreset.cpp b/src/plugins/Ui/skinned/eqpreset.cpp index 2198d50da..66e98d922 100644 --- a/src/plugins/Ui/skinned/eqpreset.cpp +++ b/src/plugins/Ui/skinned/eqpreset.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -17,6 +17,11 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + +#include <QtGlobal> +#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0)) //qAsConst template +#include <qmmp/qmmp.h> +#endif #include "eqpreset.h" EQPreset::EQPreset() diff --git a/src/plugins/Ui/skinned/preseteditor.cpp b/src/plugins/Ui/skinned/preseteditor.cpp index 7d483601a..42de31de3 100644 --- a/src/plugins/Ui/skinned/preseteditor.cpp +++ b/src/plugins/Ui/skinned/preseteditor.cpp @@ -19,6 +19,9 @@ ***************************************************************************/ #include <QIcon> +#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0)) //qAsConst template +#include <qmmp/qmmp.h> +#endif #include "eqpreset.h" #include "preseteditor.h" |
