diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-03-30 15:31:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 11:19:01 +0200 |
| commit | 3867641d78809cf81370b52c74d6cfadc7e32629 (patch) | |
| tree | fdb9c8b2bdfccfd760c868e9991604d74b530f1b /mkspecs | |
| parent | 73496630fe64b3d813480dc852000edaa3acf47b (diff) | |
Moved 'qnx' CONFIG definition to common location.
Removed the duplicated 'qnx' CONFIG defition from the mkspecs and declared it
on the common qcc-base-qnx.conf configuration file.
Change-Id: Ie215e3dd794762f20bec9c19afd5936a78a9d963
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index 11e8ca43a2..ec0d27873d 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -4,6 +4,8 @@ include(qcc-base.conf) +CONFIG += qnx + QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf index ea206e28ec..ac6da27061 100644 --- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf +++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX TARGET_PLATFORM = unix TEMPLATE = app -CONFIG += qt warn_on release link_prl qnx +CONFIG += qt warn_on release link_prl QT += core gui include(../../common/g++-unix.conf) |