AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device: don't set a default cross compile prefix

Browse Source 
qmake -set can be used instead to set a the default cross compile.
device_config.prf already contains code to read this default.

Remove per-spec CROSS_COMPILE checks

Introduce deviceSanityCheckCompiler() usage where appropriate

Done-with: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Change-Id: I07c75c9e933dc1174a1bf8bf523b6b4a6b427408
Reviewed-by: Romain Pokrzywka <romain.pokrzywka@kdab.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
This commit is contained in:
Donald Carr 2012-05-11 22:46:54 +00:00 committed by Qt by Nokia
parent 87362f3f58
commit 1da0db344a
7 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/devices/linux-archos-gen8-g++/qmake.conf
View File

@ -21,10 +21,6 @@ load(device_config)
QT_QPA_DEFAULT_PLATFORM = eglfs
isEmpty(CROSS_COMPILE) {
CROSS_COMPILE = arm-angstrom-linux-gnueabi-
}
# modifications to g++.conf
QMAKE_CC = $${CROSS_COMPILE}gcc
QMAKE_CXX = $${CROSS_COMPILE}g++
@ -57,7 +53,6 @@ QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL}
QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL}
# Sanity check
deviceSanityCheckCompiler()
load(qt_config)

2
mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
View File

@ -15,8 +15,6 @@ include(../../common/g++-unix.conf)
load(device_config)
isEmpty(CROSS_COMPILE): error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=<path>")
QMAKE_CC = $${CROSS_COMPILE}gcc
QMAKE_CXX = $${CROSS_COMPILE}g++
QMAKE_LINK = $${QMAKE_CXX}

1
mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
View File

@ -39,7 +39,6 @@ QMAKE_CFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_sourc
QMAKE_CXXFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_source_archive/linux/toolchains/gcc-4.5.2_uclibc/
QMAKE_LFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_source_archive/linux/toolchains/gcc-4.5.2_uclibc/
# Compiler Sanity check
deviceSanityCheckCompiler()
QMAKE_CFLAGS_RELEASE = -O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard

4
mkspecs/devices/linux-beagleboard-g++/qmake.conf
View File

@ -17,10 +17,6 @@ load(device_config)
QT_QPA_DEFAULT_PLATFORM = eglfs
isEmpty(CROSS_COMPILE) {
CROSS_COMPILE = arm-angstrom-linux-gnueabi-
}
# modifications to g++.conf
QMAKE_CC = $${CROSS_COMPILE}gcc
QMAKE_CXX = $${CROSS_COMPILE}g++

2
mkspecs/devices/linux-n9-g++/qmake.conf
View File

@ -31,4 +31,6 @@ QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
QT_QPA_DEFAULT_PLATFORM = xcb
deviceSanityCheckCompiler()
load(qt_config)

1
mkspecs/devices/linux-rasp-pi-g++/qmake.conf
View File

@ -49,7 +49,6 @@ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp
# Sanity check
deviceSanityCheckCompiler()
QT_QPA_DEFAULT_PLATFORM = eglfs

2
mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
View File

@ -17,8 +17,6 @@ include(../../common/g++-unix.conf)
load(device_config)
isEmpty(CROSS_COMPILE): error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=<path>")
QMAKE_CC = $${CROSS_COMPILE}gcc
QMAKE_CXX = $${CROSS_COMPILE}g++
QMAKE_LINK = $${QMAKE_CXX}