diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-18 09:29:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 08:00:26 +0200 |
| commit | e32f1a4d61f0c55d066a43657ad607131be8ca34 (patch) | |
| tree | 81ea388722187e1650b2c2b2d9c22eafae5c0527 /mkspecs/devices/linux-rpi3-g++ | |
| parent | fdb956a3ede6cb0a25112c1e1af6c93fd2051de1 (diff) | |
| parent | ee2eed350f95285b65e3dd9647e5f366e16fd5a4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
And blacklisted a few tests in tst_QUdpSocket.
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtNative.java
src/corelib/global/qglobal.cpp
src/corelib/global/qsystemdetection.h
src/corelib/io/qfileselector.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
tests/auto/network/socket/qudpsocket/BLACKLIST
Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
Diffstat (limited to 'mkspecs/devices/linux-rpi3-g++')
| -rw-r--r-- | mkspecs/devices/linux-rpi3-g++/qmake.conf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/devices/linux-rpi3-g++/qmake.conf b/mkspecs/devices/linux-rpi3-g++/qmake.conf index 600d3e7dc1..a660577565 100644 --- a/mkspecs/devices/linux-rpi3-g++/qmake.conf +++ b/mkspecs/devices/linux-rpi3-g++/qmake.conf @@ -1,4 +1,4 @@ -# qmake configuration for the Raspberry Pi 3 +# qmake configuration for the Raspberry Pi 3 (32-bit) using the Broadcom graphics stack include(../common/linux_device_pre.conf) @@ -27,9 +27,8 @@ QMAKE_LIBS_OPENGL_ES2 = $${VC_LINK_LINE} -lGLESv2 # The official opt vc EGL references GLESv2 symbols: need to link it QMAKE_LIBS_EGL = $${VC_LINK_LINE} -lEGL -lGLESv2 -# We deliberately override the existing Qt CFLAGS as they might be problematic -QMAKE_CFLAGS = -march=armv8-a+crc -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8 -pipe -Os -mthumb -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -std=c++1z +QMAKE_CFLAGS = -march=armv8-a -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8 +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS DISTRO_OPTS += hard-float DISTRO_OPTS += deb-multi-arch |