summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp')
-rw-r--r--tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
index 6a928cac7a..66160df21b 100644
--- a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
+++ b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
@@ -52,7 +52,7 @@ private:
}
public:
- QVector<QKeyEvent*> keyEvents;
+ QList<QKeyEvent *> keyEvents;
};
class tst_QKeyEvent : public QObject
@@ -98,7 +98,7 @@ void tst_QKeyEvent::basicEventDelivery()
}
}
-static bool orderByModifier(const QVector<int> &v1, const QVector<int> &v2)
+static bool orderByModifier(const QList<int> &v1, const QList<int> &v2)
{
if (v1.size() != v2.size())
return v1.size() < v2.size();
@@ -146,12 +146,12 @@ void tst_QKeyEvent::modifiers_data()
{ Qt::Key_Meta, Qt::MetaModifier },
};
- QVector<QVector<int>> modifierCombinations;
+ QList<QList<int>> modifierCombinations;
// Generate powerset (minus the empty set) of possible modifier combinations
static const int kNumModifiers = sizeof(modifiers) / sizeof(Modifier);
for (quint64 bitmask = 1; bitmask < (1 << kNumModifiers) ; ++bitmask) {
- QVector<int> modifierCombination;
+ QList<int> modifierCombination;
for (quint64 modifier = 0; modifier < kNumModifiers; ++modifier) {
if (bitmask & (quint64(1) << modifier))
modifierCombination.append(modifier);
@@ -162,7 +162,7 @@ void tst_QKeyEvent::modifiers_data()
std::sort(modifierCombinations.begin(), modifierCombinations.end(), orderByModifier);
QTest::addColumn<Qt::KeyboardModifiers>("modifiers");
- foreach (const QVector<int> combination, modifierCombinations) {
+ foreach (const QList<int> combination, modifierCombinations) {
int keys[4] = {};
Qt::KeyboardModifiers mods;
for (int i = 0; i < combination.size(); ++i) {