diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-25 10:59:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-26 11:00:57 +0200 |
| commit | 78b642eb0c2bb631793a41110df09214dccba00a (patch) | |
| tree | 80785139a4d606427debb3ea46d64e90a553e664 /src/plugins/qnx/qnx.pro | |
| parent | 306ca6fce07fca984960c825178df3ae7eb46b6a (diff) | |
Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri files
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/qnx/qnx.pro')
| -rw-r--r-- | src/plugins/qnx/qnx.pro | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 7b496bf42f..b032446f88 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -254,20 +254,10 @@ FORMS += \ qnxsettingswidget.ui \ qnxdeployqtlibrariesdialog.ui -include(../../private_headers.pri) include(./cascadesimport/cascadesimport.pri) -greaterThan(QT_MAJOR_VERSION, 4) { - QT += gui-private - DEFINES += QNX_ZIP_FILE_SUPPORT -} else { - 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.") - } -} +QT += gui-private +DEFINES += QNX_ZIP_FILE_SUPPORT DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII |