From db3dfd03c603589463ee44c0ed14dda0a16ee5cf Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 21:52:08 +0200
Subject: small script to fix Qt4 include headers

The script goes through all includes of the style of
and changes them to <QtWidget/QAction>

Simply run over your source code to get most compile
errors due to classes that moved between different
Qt libraries fixed.
---
 bin/fixqt4headers | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 bin/fixqt4headers

(limited to 'bin')

diff --git a/bin/fixqt4headers b/bin/fixqt4headers
new file mode 100755
index 0000000000..8546815e74
--- /dev/null
+++ b/bin/fixqt4headers
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+modules=`ls $QTDIR/include`
+
+files=`find * -name '*.h' -or -name '*.cpp' -or -name '*.C'`
+
+echo $files
+
+for module in $modules; do
+# once we change other things, change the line from == "QtWidgets" to != "Qt" to get everything fixed
+    if [ $module == "QtWidgets" ]; then
+        echo $module ":"
+        includes=`ls $QTDIR/include/$module`
+        for i in $includes; do
+#            echo "    fixing " $i
+            perl -pi -e "s,^#include +<.+/$i>,#include <$module/$i>," $files;
+#            perl -pi -e 's,^#include +".+/$i",#include "$module/$i",' $files;
+        done;
+    fi;
+done;
-- 
cgit v1.2.3


From 445f37992918f9a046120b8bde88a407eaaaae9c Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sun, 8 May 2011 09:47:19 +0200
Subject: replace generic <QtGui> header as well

---
 bin/fixqt4headers | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/fixqt4headers b/bin/fixqt4headers
index 8546815e74..0bb6add8f8 100755
--- a/bin/fixqt4headers
+++ b/bin/fixqt4headers
@@ -18,3 +18,6 @@ for module in $modules; do
         done;
     fi;
 done;
+
+perl -pi -e 's,<QtGui>,<QtWidgets>,' $files
+perl -pi -e 's,<QtGui/QtGui>,<QtWidgets/QtWidgets>,' $files
-- 
cgit v1.2.3


From 3c36a52e1b536d35a19f27ffde8a28e6f5da7659 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Thu, 11 Aug 2011 10:44:39 +0200
Subject: include .cc and .CC in fix headers script

Change-Id: Ie8903d59013535e04537c1a5b50fa710a02cb8f0
Reviewed-on: http://codereview.qt.nokia.com/2849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 bin/fixqt4headers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/fixqt4headers b/bin/fixqt4headers
index 0bb6add8f8..0e3d541d03 100755
--- a/bin/fixqt4headers
+++ b/bin/fixqt4headers
@@ -2,7 +2,7 @@
 
 modules=`ls $QTDIR/include`
 
-files=`find * -name '*.h' -or -name '*.cpp' -or -name '*.C'`
+files=`find * -name '*.h' -or -name '*.cpp' -or -name '*.C' -or -name '*.cc' -or -name '*.CC'`
 
 echo $files
 
-- 
cgit v1.2.3


From f4f1b53b9646288d73979f8339a90fbbbcb9eedc Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Tue, 16 Aug 2011 16:38:56 +0200
Subject: Move printing into it's own library

Create a libQtPrintSupport library that contains our current
printing infrastructure. Long term this will get replaced
with a libQtPrint, as the current architecture is not
really maintainable.

Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2
Reviewed-on: http://codereview.qt.nokia.com/3209
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
 bin/fixqt4headers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/fixqt4headers b/bin/fixqt4headers
index 0e3d541d03..58b0fdf43d 100755
--- a/bin/fixqt4headers
+++ b/bin/fixqt4headers
@@ -8,7 +8,7 @@ echo $files
 
 for module in $modules; do
 # once we change other things, change the line from == "QtWidgets" to != "Qt" to get everything fixed
-    if [ $module == "QtWidgets" ]; then
+    if [ $module == "QtWidgets" ] || [ $module == "QtPrintSupport" ]; then
         echo $module ":"
         includes=`ls $QTDIR/include/$module`
         for i in $includes; do
-- 
cgit v1.2.3