Commit 00b90e3f authored by Kai Koehne's avatar Kai Koehne

Qt5: Fix checking for private headers

Change-Id: I66ea39bb4ced671f3ccd6f926fa43e629e2c1251
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent 4e3c409d
...@@ -161,11 +161,17 @@ FORMS += \ ...@@ -161,11 +161,17 @@ FORMS += \
blackberrydebugtokenrequestdialog.ui blackberrydebugtokenrequestdialog.ui
include(../../private_headers.pri) 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 DEFINES += QNX_ZIP_FILE_SUPPORT
} else { } else {
warning("The QNX plugin depends on private headers from QtGui module, to be fully functional.") exists($${QT_PRIVATE_HEADERS}/QtGui/private/qzipreader_p.h) {
warning("To fix it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.") 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 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment