diff options
Diffstat (limited to 'src/plugins/styles')
-rw-r--r-- | src/plugins/styles/android/qandroidstyle.cpp | 2 | ||||
-rw-r--r-- | src/plugins/styles/android/qandroidstyle_p.h | 8 | ||||
-rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p_p.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp index 1d0838daec..0a4e4286e0 100644 --- a/src/plugins/styles/android/qandroidstyle.cpp +++ b/src/plugins/styles/android/qandroidstyle.cpp @@ -845,7 +845,7 @@ int QAndroidStyle::Android9PatchDrawable::calculateStretch(int boundsLimit, } void QAndroidStyle::Android9PatchDrawable::extractIntArray(const QVariantList &values, - QVector<int> & array) + QList<int> & array) { for (const QVariant &value : values) array << value.toInt(); diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h index 6cb30a2f79..5730bdfe2c 100644 --- a/src/plugins/styles/android/qandroidstyle_p.h +++ b/src/plugins/styles/android/qandroidstyle_p.h @@ -89,9 +89,9 @@ public: struct Android9PatchChunk { - QVector<int> xDivs; - QVector<int> yDivs; - QVector<int> colors; + QList<int> xDivs; + QList<int> yDivs; + QList<int> colors; }; struct AndroidItemStateInfo @@ -169,7 +169,7 @@ public: static int calculateStretch(int boundsLimit, int startingPoint, int srcSpace, int numStrechyPixelsRemaining, int numFixedPixelsRemaining); - void extractIntArray(const QVariantList &values, QVector<int> &array); + void extractIntArray(const QVariantList &values, QList<int> &array); private: Android9PatchChunk m_chunkData; }; diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h index 274936bd79..6305a0ea1f 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -45,12 +45,12 @@ #include <QtCore/qdebug.h> #include <QtCore/qhash.h> +#include <QtCore/qlist.h> #include <QtCore/qmap.h> #include <QtCore/qmath.h> #include <QtCore/qpair.h> #include <QtCore/qpointer.h> #include <QtCore/qtextstream.h> -#include <QtCore/qvector.h> #include <QtGui/private/qpainter_p.h> @@ -291,7 +291,7 @@ public: public: mutable QPointer<QObject> autoDefaultButton; - static QVector<QPointer<QObject> > scrollBars; + static QList<QPointer<QObject> > scrollBars; mutable QPointer<QFocusFrame> focusWidget; mutable NSView *backingStoreNSView; |