Merge remote-tracking branch 'origin/stable' into release

Conflicts: qtxmlpatterns Change-Id: Ida8491147bce712af45ab55cea7d9bd14ca9b9eb
2026-03-17 09:46:08 +08:00 · 2014-02-17 11:21:58 +01:00
parent 17e103bb5d fe236cc44c
commit e1cd7c130b
25 changed files with 25 additions and 24 deletions
--- a/qt.pro
+++ b/qt.pro
@@ -3,6 +3,7 @@ cache(, super)

 CONFIG += build_pass   # hack to disable the .qmake.super auto-add
 load(qt_build_config)
+CONFIG -= build_pass   # unhack, as it confuses Qt Creator

 TEMPLATE      = subdirs

--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2