Patch for Qt5 change of QKeySequence count type

garybuhrmaster · Sep 10, 2013 · dcc1fa9 · dcc1fa9
1 parent ff2de07
commit dcc1fa9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -375,7 +375,13 @@ void LIRC::Process(const QByteArray &data)
         }
 
         vector<LircKeycodeEvent*> 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;