From a69edf01cb0a2a06282dc7b89724ffa542f6546d Mon Sep 17 00:00:00 2001
From: Kimmo Ollila <kimmo.ollila@qt.io>
Date: Wed, 3 May 2017 12:45:45 +0300
Subject: Add qtConfig(dlopen) check before adding libdl

Change-Id: Iad67b9719fe6336b8dfc28de2e88463c588a0849
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/compiler/compiler.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qml/compiler/compiler.pri')

diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri
index 31ee917b39..60f548a2b0 100644
--- a/src/qml/compiler/compiler.pri
+++ b/src/qml/compiler/compiler.pri
@@ -41,7 +41,7 @@ SOURCES += \
 unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp
 else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp
 
-qtConfig(private_tests):unix: QMAKE_USE_PRIVATE += libdl
+qtConfig(private_tests):qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl
 }
 
 qmldevtools_build|qtConfig(qml-interpreter) {
-- 
cgit v1.2.3


From 55d2d4cfc0b5c64b0fd8a80b868673971200f7c4 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Wed, 7 Jun 2017 17:14:03 +0300
Subject: Fix gcc5 miscompile of qle_bitfield

Task-number:  QTBUG-61123
Change-Id: I124d925846a2f485f7b69870c5eebc7f7f6b50f7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/qml/compiler/compiler.pri | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/qml/compiler/compiler.pri')

diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri
index 60f548a2b0..d9b985e33b 100644
--- a/src/qml/compiler/compiler.pri
+++ b/src/qml/compiler/compiler.pri
@@ -52,3 +52,7 @@ qmldevtools_build|qtConfig(qml-interpreter) {
         $$PWD/qv4instr_moth.cpp \
         $$PWD/qv4isel_moth.cpp
 }
+
+gcc {
+    equals(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -fno-strict-aliasing
+}
-- 
cgit v1.2.3