Common Source Code Project for Qt (a.k.a for FM-7).
| Révision | 24c9459956c8a961ec307c1c37699d05828154d5 (tree) |
|---|---|
| l'heure | 2021-11-24 00:51:26 |
| Auteur | Kyuma Ohta <whatisthis.sowhat@gmai...> |
| Commiter | Kyuma Ohta |
[Qt][EMU_THREAD][Ubuntu_Xenial] Fix FTBFS with Qt < 5.14 .
source/src/qt/gui/emu_thread_tmpl.h (diff)
source/src/qt/gui/qt_input.cpp (diff)| @@ -15,7 +15,12 @@ | ||
| 15 | 15 | #include <QString> |
| 16 | 16 | #include <QStringList> |
| 17 | 17 | #include <QElapsedTimer> |
| 18 | -#include <QRecursiveMutex> | |
| 18 | +#if QT_VERSION >= 0x051400 | |
| 19 | + #include <QRecursiveMutex> | |
| 20 | +#else | |
| 21 | + #include <QMutex> | |
| 22 | +#endif | |
| 23 | + | |
| 19 | 24 | #include <QMutexLocker> |
| 20 | 25 | |
| 21 | 26 | #include "fifo.h" |
| @@ -81,9 +86,13 @@ protected: | ||
| 81 | 86 | config_t *p_config; |
| 82 | 87 | |
| 83 | 88 | QWaitCondition *drawCond; |
| 89 | +#if QT_VERSION >= 0x051400 | |
| 84 | 90 | QRecursiveMutex keyMutex; |
| 85 | 91 | QRecursiveMutex mouseMutex; |
| 86 | - | |
| 92 | +#else | |
| 93 | + QMutex keyMutex; | |
| 94 | + QMutex mouseMutex; | |
| 95 | +#endif | |
| 87 | 96 | //class META_MainWindow *MainWindow; |
| 88 | 97 | Ui_MainWindowBase *MainWindow; |
| 89 | 98 | QElapsedTimer tick_timer; |
| @@ -101,7 +110,11 @@ protected: | ||
| 101 | 110 | QString sStateFile; |
| 102 | 111 | QString lStateFile; |
| 103 | 112 | |
| 113 | +#if QT_VERSION >= 0x051400 | |
| 104 | 114 | QRecursiveMutex uiMutex; |
| 115 | +#else | |
| 116 | + QMutex uiMutex; | |
| 117 | +#endif | |
| 105 | 118 | char dbg_prev_command[MAX_COMMAND_LEN]; |
| 106 | 119 | int fd_open_wait_count[8]; |
| 107 | 120 | QString fd_reserved_path[8]; |
| @@ -198,7 +198,11 @@ void GLDrawClass::initKeyCode(void) | ||
| 198 | 198 | QStringList nlist; |
| 199 | 199 | bool ok1, ok2; |
| 200 | 200 | nstr = QString::fromUtf8(buf); |
| 201 | - nlist = nstr.split(",", Qt::SkipEmptyParts); | |
| 201 | + #if QT_VERSION >= 0x051400 | |
| 202 | + nlist = nstr.split(",", Qt::SkipEmptyParts); | |
| 203 | + #else | |
| 204 | + nlist = nstr.split(","); // ToDo: Empty field. | |
| 205 | + #endif | |
| 202 | 206 | if(nlist.count() < 2) continue; |
| 203 | 207 | uint32_t vk = nlist.at(0).toULong(&ok1, 16); |
| 204 | 208 | uint32_t scan = nlist.at(1).toULong(&ok2, 16); |
Fork