diff options
| author | Franklin Wei <franklin@rockbox.org> | 2019-11-10 01:38:17 -0500 |
|---|---|---|
| committer | Franklin Wei <franklin@rockbox.org> | 2019-11-10 19:53:36 -0500 |
| commit | a8be52c62aa2a21d1eceaf55586c53b39f508410 (patch) | |
| tree | 76b5112a15f0901eddf13f77a15dd1c95167fc9e | |
| parent | a5f228eee2240c3d12f0d03b51adad5603cb10d3 (diff) | |
| download | rockbox-a8be52c62aa2a21d1eceaf55586c53b39f508410.tar.gz rockbox-a8be52c62aa2a21d1eceaf55586c53b39f508410.zip | |
rbutil: fix windows release build
This fixes two of them: not finding the lrelease binary and not
compiling for C++11 (which is required by some Qt headers now).
Change-Id: I3c0eb3c2002c3ce7a2eeea877db5fa6942c9b2ba
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 43d74e59d7..d5caa77b89 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
| @@ -107,7 +107,8 @@ QMAKE_EXTRA_TARGETS += tags | |||
| 107 | 107 | ||
| 108 | # add a custom rule for making the translations | 108 | # add a custom rule for making the translations |
| 109 | LRELEASE = $$[QT_INSTALL_BINS]/lrelease | 109 | LRELEASE = $$[QT_INSTALL_BINS]/lrelease |
| 110 | win32:!cross { | 110 | |
| 111 | win32:!cross:!exists($$LRELEASE) { | ||
| 111 | LRELEASE = $$[QT_INSTALL_BINS]/lrelease.exe | 112 | LRELEASE = $$[QT_INSTALL_BINS]/lrelease.exe |
| 112 | } | 113 | } |
| 113 | lrelease.commands = $$LRELEASE -silent $$_PRO_FILE_ | 114 | lrelease.commands = $$LRELEASE -silent $$_PRO_FILE_ |
| @@ -164,6 +165,8 @@ contains(QT_MAJOR_VERSION, 5) { | |||
| 164 | } | 165 | } |
| 165 | } | 166 | } |
| 166 | 167 | ||
| 168 | CONFIG += c++11 | ||
| 169 | |||
| 167 | dbg { | 170 | dbg { |
| 168 | CONFIG += debug thread qt warn_on | 171 | CONFIG += debug thread qt warn_on |
| 169 | DEFINES += DBG | 172 | DEFINES += DBG |