diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-27 12:16:15 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-27 20:11:17 +0100 |
| commit | 13c5c463d09cce11d3e52ad36dbdb22a2dc5aceb (patch) | |
| tree | 62d8ff28c9fe71441e80074b9a6c8b23deded5ee | |
| parent | 7184980dcaf57178fc131b4b8c72e84c7c464fee (diff) | |
| download | rockbox-13c5c463d09cce11d3e52ad36dbdb22a2dc5aceb.tar.gz rockbox-13c5c463d09cce11d3e52ad36dbdb22a2dc5aceb.zip | |
Update project file for Qt5 compatibility.
Qt5 splits widgets out of the QtGui to a new QtWidgets module.
Change-Id: I35c6437a2e69c25b90989611a683855dfe31da80
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 20 |
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 } # check version of Qt installation -VER = $$find(QT_VERSION, ^4\\.[5-9]+.*) -isEmpty(VER) { - message("Qt >= 4.5 required!") - !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION]) -} +!contains(QT_MAJOR_VERSION, 5) { + VER = $$find(QT_VERSION, ^4\\.[5-9]+.*) + isEmpty(VER) { + message("Qt >= 4.5 required!") + !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION]) + } message("Qt version used:" $$VER) +} MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42]) @@ -170,6 +172,12 @@ for(rblib, RBLIBS) { TEMPLATE = app TARGET = RockboxUtility QT += network + +contains(QT_MAJOR_VERSION, 5) { + message("Qt5 found") + QT += widgets +} + dbg { CONFIG += debug thread qt warn_on DEFINES -= QT_NO_DEBUG_OUTPUT @@ -229,7 +237,7 @@ macx { -framework IOKit -framework CoreFoundation -framework Carbon \ -framework SystemConfiguration -framework CoreServices INCLUDEPATH += /usr/local/include - + # rule for creating a dmg file dmg.commands = hdiutil create -ov -srcfolder rbutilqt.app/ rbutil.dmg QMAKE_EXTRA_TARGETS += dmg |