summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/qcc-base-qnx-armv7le.conf25
-rw-r--r--mkspecs/common/qcc-base-qnx-x86.conf25
-rw-r--r--mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf4
-rw-r--r--mkspecs/unsupported/blackberry-x86-qcc/qmake.conf2
-rw-r--r--mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf22
-rw-r--r--mkspecs/unsupported/qnx-x86-qcc/qmake.conf22
6 files changed, 57 insertions, 43 deletions
diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf
new file mode 100644
index 0000000000..8270a27625
--- /dev/null
+++ b/mkspecs/common/qcc-base-qnx-armv7le.conf
@@ -0,0 +1,25 @@
+#
+# qmake configuration for qnx-qcc armv7 targets
+#
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release link_prl
+QT += core gui
+
+include(g++-unix.conf)
+include(unix.conf)
+
+QMAKE_CC = qcc -Vgcc_ntoarmv7le
+QNX_CPUDIR = armle-v7
+
+include(qcc-base-qnx.conf)
+
+QMAKE_AR = ntoarmv7-ar cqs
+QMAKE_OBJCOPY = ntoarmv7-objcopy
+QMAKE_RANLIB = ntoarmv7-ranlib
+
+QMAKE_STRIP = ntoarmv7-strip
+
+load(qt_config)
diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
new file mode 100644
index 0000000000..5e88ba8b54
--- /dev/null
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -0,0 +1,25 @@
+#
+# qmake configuration for qnx-qcc x86 targets
+#
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release link_prl
+QT += core gui
+
+include(g++-unix.conf)
+include(unix.conf)
+
+QMAKE_CC = qcc -Vgcc_ntox86
+QNX_CPUDIR = x86
+
+include(qcc-base-qnx.conf)
+
+QMAKE_AR = ntox86-ar cqs
+QMAKE_OBJCOPY = ntox86-objcopy
+QMAKE_RANLIB = ntox86-ranlib
+
+QMAKE_STRIP = ntox86-strip
+
+load(qt_config)
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
index 4e72667c5d..efb585b6a5 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
@@ -1,5 +1,5 @@
#
-# qmake configuration for blackberry x86 systems
+# qmake configuration for blackberry armv7le systems
#
DEFINES += Q_OS_BLACKBERRY
@@ -9,4 +9,4 @@ LIBS += -lbps
# Blackberry also has support for stack smashing protection in its libc
QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
-include(../qnx-armv7le-qcc/qmake.conf)
+include(../../common/qcc-base-qnx-armv7le.conf)
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
index 60b67f801e..3fd84c13a6 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
@@ -9,4 +9,4 @@ LIBS += -lbps
# Blackberry also has support for stack smashing protection in its libc
QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
-include(../qnx-x86-qcc/qmake.conf)
+include(../../common/qcc-base-qnx-x86.conf)
diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
index ac6da27061..37c66cd178 100644
--- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
@@ -2,24 +2,6 @@
# qmake configuration for qnx-qcc armv7 targets
#
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-QT += core gui
+include(../../common/qcc-base-qnx-armv7le.conf)
-include(../../common/g++-unix.conf)
-include(../../common/unix.conf)
-
-QMAKE_CC = qcc -Vgcc_ntoarmv7le
-QNX_CPUDIR = armle-v7
-
-include(../../common/qcc-base-qnx.conf)
-
-QMAKE_AR = ntoarmv7-ar cqs
-QMAKE_OBJCOPY = ntoarmv7-objcopy
-QMAKE_RANLIB = ntoarmv7-ranlib
-
-QMAKE_STRIP = ntoarmv7-strip
-
-load(qt_config)
+DEFINES += QT_NO_CLIPBOARD
diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
index fef8d443c1..cf588bae1c 100644
--- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
@@ -2,24 +2,6 @@
# qmake configuration for qnx-qcc x86 targets
#
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-QT += core gui
+include(../../common/qcc-base-qnx-x86.conf)
-include(../../common/g++-unix.conf)
-include(../../common/unix.conf)
-
-QMAKE_CC = qcc -Vgcc_ntox86
-QNX_CPUDIR = x86
-
-include(../../common/qcc-base-qnx.conf)
-
-QMAKE_AR = ntox86-ar cqs
-QMAKE_OBJCOPY = ntox86-objcopy
-QMAKE_RANLIB = ntox86-ranlib
-
-QMAKE_STRIP = ntox86-strip
-
-load(qt_config)
+DEFINES += QT_NO_CLIPBOARD