diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-03-05 12:44:07 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-03-05 14:36:51 +0100 |
| commit | 00b90e3f5c51a72b324ac054b3b1a5ce356cd454 (patch) | |
| tree | b0758849c1b8dbc1f6cb4e9ad231a88067c5b610 | |
| parent | 4e3c409d16cea734ff9e7c3ac915d2dbe2fa799d (diff) | |
Qt5: Fix checking for private headers
Change-Id: I66ea39bb4ced671f3ccd6f926fa43e629e2c1251
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/plugins/qnx/qnx.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 6a08e9f793..882954c40e 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -161,11 +161,17 @@ FORMS += \ blackberrydebugtokenrequestdialog.ui include(../../private_headers.pri) -exists($${QT_PRIVATE_HEADERS}/QtGui/private/qzipreader_p.h) { + +greaterThan(QT_MAJOR_VERSION, 4) { + QT += gui-private DEFINES += QNX_ZIP_FILE_SUPPORT } else { - warning("The QNX plugin depends on private headers from QtGui module, to be fully functional.") - warning("To fix it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.") + exists($${QT_PRIVATE_HEADERS}/QtGui/private/qzipreader_p.h) { + DEFINES += QNX_ZIP_FILE_SUPPORT + } else { + warning("The QNX plugin depends on private headers from QtGui module, to be fully functional.") + warning("To fix it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.") + } } DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII |