summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro20
1 files changed, 14 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 70a2d2aa3d..b5a18090a6 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -37,12 +37,14 @@ RCC_DIR = $$MYBUILDDIR/rcc
37} 37}
38 38
39# check version of Qt installation 39# check version of Qt installation
40VER = $$find(QT_VERSION, ^4\\.[5-9]+.*) 40!contains(QT_MAJOR_VERSION, 5) {
41isEmpty(VER) { 41 VER = $$find(QT_VERSION, ^4\\.[5-9]+.*)
42 message("Qt >= 4.5 required!") 42 isEmpty(VER) {
43 !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION]) 43 message("Qt >= 4.5 required!")
44} 44 !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION])
45 }
45message("Qt version used:" $$VER) 46message("Qt version used:" $$VER)
47}
46 48
47MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42]) 49MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42])
48 50
@@ -170,6 +172,12 @@ for(rblib, RBLIBS) {
170TEMPLATE = app 172TEMPLATE = app
171TARGET = RockboxUtility 173TARGET = RockboxUtility
172QT += network 174QT += network
175
176contains(QT_MAJOR_VERSION, 5) {
177 message("Qt5 found")
178 QT += widgets
179}
180
173dbg { 181dbg {
174 CONFIG += debug thread qt warn_on 182 CONFIG += debug thread qt warn_on
175 DEFINES -= QT_NO_DEBUG_OUTPUT 183 DEFINES -= QT_NO_DEBUG_OUTPUT
@@ -229,7 +237,7 @@ macx {
229 -framework IOKit -framework CoreFoundation -framework Carbon \ 237 -framework IOKit -framework CoreFoundation -framework Carbon \
230 -framework SystemConfiguration -framework CoreServices 238 -framework SystemConfiguration -framework CoreServices
231 INCLUDEPATH += /usr/local/include 239 INCLUDEPATH += /usr/local/include
232 240
233 # rule for creating a dmg file 241 # rule for creating a dmg file
234 dmg.commands = hdiutil create -ov -srcfolder rbutilqt.app/ rbutil.dmg 242 dmg.commands = hdiutil create -ov -srcfolder rbutilqt.app/ rbutil.dmg
235 QMAKE_EXTRA_TARGETS += dmg 243 QMAKE_EXTRA_TARGETS += dmg