diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 20:09:58 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-23 20:09:58 +0000 |
| commit | 06f55f0695932870b8f874949591662a9fb64008 (patch) | |
| tree | cb3a911a66726c94393f0d95eadabc8423be4a41 /mkspecs/common | |
| parent | fa2368263035de40091368529c4e8197c756ff33 (diff) | |
| parent | dd90af122154af8ba8cba16c8760c3d2a1d0fcab (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-aarch64le.conf | 23 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-x86-64.conf | 23 |
3 files changed, 47 insertions, 1 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 3adf868ea4..d24a1d665c 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -7,7 +7,7 @@ QMAKE_PLATFORM += mac darwin MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname sdk +CONFIG += app_bundle incremental global_init_link_order lib_version_first sdk QMAKE_INCREMENTAL_STYLE = sublib include(unix.conf) diff --git a/mkspecs/common/qcc-base-qnx-aarch64le.conf b/mkspecs/common/qcc-base-qnx-aarch64le.conf new file mode 100644 index 0000000000..914ef33f37 --- /dev/null +++ b/mkspecs/common/qcc-base-qnx-aarch64le.conf @@ -0,0 +1,23 @@ +# +# qmake configuration for qnx-qcc aarch64le targets +# + +MAKEFILE_GENERATOR = UNIX + +include(g++-unix.conf) +include(unix.conf) + +QMAKE_CC = qcc -Vgcc_ntoaarch64le +QMAKE_CXX = qcc -Vgcc_ntoaarch64le +QNX_CPUDIR = aarch64le + +include(qcc-base-qnx.conf) + +QMAKE_AR = ntoaarch64-ar cqs +QMAKE_OBJCOPY = ntoaarch64-objcopy +QMAKE_NM = ntoaarch64-nm -P +QMAKE_RANLIB = ntoaarch64-ranlib + +QMAKE_STRIP = ntoaarch64-strip + +load(qt_config) diff --git a/mkspecs/common/qcc-base-qnx-x86-64.conf b/mkspecs/common/qcc-base-qnx-x86-64.conf new file mode 100644 index 0000000000..fd04104f71 --- /dev/null +++ b/mkspecs/common/qcc-base-qnx-x86-64.conf @@ -0,0 +1,23 @@ +# +# qmake configuration for qnx-qcc x86-64 targets +# + +MAKEFILE_GENERATOR = UNIX + +include(g++-unix.conf) +include(unix.conf) + +QMAKE_CC = qcc -Vgcc_ntox86_64 +QMAKE_CXX = qcc -Vgcc_ntox86_64 +QNX_CPUDIR = x86_64 + +include(qcc-base-qnx.conf) + +QMAKE_AR = ntox86_64-ar cqs +QMAKE_OBJCOPY = ntox86_64-objcopy +QMAKE_NM = ntox86_64-nm -P +QMAKE_RANLIB = ntox86_64-ranlib + +QMAKE_STRIP = ntox86_64-strip + +load(qt_config) |