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

Fixed mkspecs/devices/linux_device_post.conf for non-arm platforms.

Browse Source 
Now arm specific -mfloat-abi flag is added to compiler flags
only for arm architecture in linux_arm_device_post.conf.

Change-Id: Ie77ac6e0717d9d1fd9c14e1d6a26e86f08ab418c
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tomasz Olszak 2013-07-18 20:45:47 +00:00 committed by The Qt Project
parent 77833b90c8
commit f2a611ce6c
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/devices/common/linux_arm_device_post.conf Normal file
View File

@ -0,0 +1,7 @@
contains(DISTRO_OPTS, hard-float) {
COMPILER_FLAGS += -mfloat-abi=hard
} else {
COMPILER_FLAGS += -mfloat-abi=softfp
}
include(linux_device_post.conf)

6
mkspecs/devices/common/linux_device_post.conf
View File

@ -3,12 +3,6 @@ contains(DISTRO_OPTS, deb-multi-arch) {
-Wl,-rpath-link,$$[QT_SYSROOT]/lib/$${GCC_MACHINE_DUMP}
}
contains(DISTRO_OPTS, hard-float) {
COMPILER_FLAGS += -mfloat-abi=hard
} else {
COMPILER_FLAGS += -mfloat-abi=softfp
}
QMAKE_CFLAGS += $$COMPILER_FLAGS
QMAKE_CXXFLAGS += $$COMPILER_FLAGS

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

@ -32,6 +32,6 @@ QMAKE_CXXFLAGS_RELEASE += $$IMX5_CFLAGS_RELEASE
QMAKE_CFLAGS_DEBUG += $$IMX5_CFLAGS
QMAKE_CXXFLAGS_DEBUG += $$IMX5_CFLAGS
include(../common/linux_device_post.conf)
include(../common/linux_arm_device_post.conf)
load(qt_config)

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

@ -34,6 +34,6 @@ QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE
QMAKE_CFLAGS_DEBUG += $$IMX6_CFLAGS
QMAKE_CXXFLAGS_DEBUG += $$IMX6_CFLAGS
include(../common/linux_device_post.conf)
include(../common/linux_arm_device_post.conf)
load(qt_config)

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

@ -42,6 +42,6 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp
EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
include(../common/linux_device_post.conf)
include(../common/linux_arm_device_post.conf)
load(qt_config)

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

@ -26,6 +26,6 @@ TEGRA2_CFLAGS = -mtune=cortex-a9 -march=armv7-a -mhard-float -mfloat-a
QMAKE_CFLAGS += $$TEGRA2_CFLAGS
QMAKE_CXXFLAGS += $$TEGRA2_CFLAGS
include(../common/linux_device_post.conf)
include(../common/linux_arm_device_post.conf)
load(qt_config)