From dcc1fa914cf2614543bb274da6faa8a6db543946 Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Tue, 10 Sep 2013 16:27:13 +0000 Subject: [PATCH] Patch for Qt5 change of QKeySequence count type --- mythtv/libs/libmythui/jsmenu.cpp | 7 ++++++- mythtv/libs/libmythui/lirc.cpp | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmythui/jsmenu.cpp b/mythtv/libs/libmythui/jsmenu.cpp index 1a5a9428599..0f409023290 100644 --- a/mythtv/libs/libmythui/jsmenu.cpp +++ b/mythtv/libs/libmythui/jsmenu.cpp @@ -306,7 +306,12 @@ void JoystickMenuThread::EmitKey(QString code) QCoreApplication::postEvent(m_mainWindow, new JoystickKeycodeEvent(code, keycode, true)); - for (unsigned int i = 0; i < a.count(); i++) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + unsigned int i; +#else + int i; +#endif + for (i = 0; i < a.count(); i++) { keycode = a[i]; diff --git a/mythtv/libs/libmythui/lirc.cpp b/mythtv/libs/libmythui/lirc.cpp index 9af5edfd9d2..17f3e949563 100644 --- a/mythtv/libs/libmythui/lirc.cpp +++ b/mythtv/libs/libmythui/lirc.cpp @@ -375,7 +375,13 @@ void LIRC::Process(const QByteArray &data) } vector keyReleases; - for (unsigned int i = 0; i < a.count(); i++) + +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + unsigned int i; +#else + int i; +#endif + for (i = 0; i < a.count(); i++) { int keycode = a[i]; Qt::KeyboardModifiers mod = Qt::NoModifier;