diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-04-04 21:53:46 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-04-04 21:53:46 +0000 |
| commit | 6e0f34f5f57e47ba9c09be0640db971af2191631 (patch) | |
| tree | 05f9bd10b60f464fa4a72fb27d97393c4b2eb9c5 /src/plugins | |
| parent | 64a0861bc42b2667a562ce8fbf82081282241bbc (diff) | |
| download | qmmp-6e0f34f5f57e47ba9c09be0640db971af2191631.tar.gz qmmp-6e0f34f5f57e47ba9c09be0640db971af2191631.tar.bz2 qmmp-6e0f34f5f57e47ba9c09be0640db971af2191631.zip | |
fixed build with qt 5.9
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8773 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Ui/qsui/elidinglabel.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/equalizer.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/listwidgetdrawer.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/playlistheader.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/listwidgetdrawer.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/playlistheader.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/playlistselector.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/textscroller.cpp | 4 |
8 files changed, 32 insertions, 0 deletions
diff --git a/src/plugins/Ui/qsui/elidinglabel.cpp b/src/plugins/Ui/qsui/elidinglabel.cpp index 71d13ce74..bba4fb7ff 100644 --- a/src/plugins/Ui/qsui/elidinglabel.cpp +++ b/src/plugins/Ui/qsui/elidinglabel.cpp @@ -32,6 +32,10 @@ #include <QPainter> #include <QStyle> +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + /*! \class Utils::ElidingLabel diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp index 1b58697f6..cb32a202c 100644 --- a/src/plugins/Ui/qsui/equalizer.cpp +++ b/src/plugins/Ui/qsui/equalizer.cpp @@ -34,6 +34,10 @@ #include <qmmp/qmmpsettings.h> #include "equalizer.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + Equalizer::Equalizer(QWidget *parent) : QDialog(parent) { setWindowTitle(tr("Equalizer")); diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp index 02ba92a2e..3c046fde9 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp +++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp @@ -25,6 +25,10 @@ #include <qmmpui/playlistmanager.h> #include "listwidgetdrawer.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + // |= number=|=row1=|=row2=|=extra= duration=| ListWidgetDrawer::ListWidgetDrawer() diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp index 359972454..d2b52caa7 100644 --- a/src/plugins/Ui/qsui/playlistheader.cpp +++ b/src/plugins/Ui/qsui/playlistheader.cpp @@ -39,6 +39,10 @@ #include "playlistheader.h" #include "listwidgetdrawer.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + #define INITAL_SIZE 150 #define MIN_SIZE 30 #define MAX_COLUMNS 7 diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp index d2d22bf54..1ccbc01f4 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp +++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp @@ -25,6 +25,10 @@ #include "skin.h" #include "listwidgetdrawer.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + // |= number=|=row1=|=row2=|=extra= duration=| ListWidgetDrawer::ListWidgetDrawer() diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp index 5467f7996..0507f2f98 100644 --- a/src/plugins/Ui/skinned/playlistheader.cpp +++ b/src/plugins/Ui/skinned/playlistheader.cpp @@ -39,6 +39,10 @@ #include "playlistheader.h" #include "listwidgetdrawer.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + #define INITAL_SIZE 150 #define MAX_COLUMNS 7 #define MIN_SIZE 30 diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp index 81bfe8243..d3f3006c9 100644 --- a/src/plugins/Ui/skinned/playlistselector.cpp +++ b/src/plugins/Ui/skinned/playlistselector.cpp @@ -34,6 +34,10 @@ #include "skin.h" #include "playlistselector.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) : QWidget(parent) { m_scrollable = false; diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp index fbe0523d2..8c571fade 100644 --- a/src/plugins/Ui/skinned/textscroller.cpp +++ b/src/plugins/Ui/skinned/textscroller.cpp @@ -35,6 +35,10 @@ #include "actionmanager.h" #include "textscroller.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + #define SCROLL_SEP " *** " #define TITLE_FORMAT "%p%if(%p&%t, - ,)%t%if(%p,,%if(%t,,%f))%if(%l, - %l,)" |
