diff options
author | Karim Pinter <karim.pinter@qt.io> | 2017-12-15 12:56:47 +0200 |
---|---|---|
committer | Karim Pinter <karim.pinter@qt.io> | 2017-12-19 11:07:12 +0000 |
commit | 3af9d774316ef0edf65acb478871d89231b930f2 (patch) | |
tree | b89e2b29a7bbce9d36fb496f481c37c44423e9cf /src/corelib | |
parent | b0938cb6c1fa29ec2d2a4fb9273e515cd0d6c08e (diff) |
Fix pps and imf support for QNX builds
Change from config to feature in the json and pro files.
Change-Id: I58ddac3c4ad739253bae010f1d5023fc1d481047
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/configure.json | 2 | ||||
-rw-r--r-- | src/corelib/kernel/kernel.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 3db9942123..6002e1d4fc 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -509,7 +509,7 @@ "label": "PPS", "emitIf": "config.qnx", "condition": "libs.pps", - "output": [ "privateConfig" ] + "output": [ "privateFeature" ] }, "qeventtransition": { "label": "QEventTransition class", diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 29bd5bbc6c..9bc6e198f8 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -187,7 +187,7 @@ vxworks { kernel/qfunctions_vxworks.h } -qqnx_pps { +qnx:qtConfig(qqnx_pps) { QMAKE_USE_PRIVATE += pps SOURCES += \ kernel/qppsattribute.cpp \ |