From 8cc41e5686687981c67aea4d889cca273d260dad Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Mon, 19 Sep 2011 20:48:57 -0400
Subject: [PATCH] Improve Qt configure flags

---
 kdesrc-build-setup    | 3 ++-
 kdesrc-buildrc-sample | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kdesrc-build-setup b/kdesrc-build-setup
index 0da3047..5f469f0 100755
--- a/kdesrc-build-setup
+++ b/kdesrc-build-setup
@@ -307,13 +307,14 @@ if (grep /^qt$/, @chosenModules) {
     print $output <<EOF;
 module qt-copy
     configure-flags -fast -debug -system-zlib -system-libpng -system-libjpeg \\
+                    -plugin-sql-mysql -no-phonon \\
                     -dbus -webkit -nomake examples -nomake demos
 
     # KDE's unmodified copy of Qt is used by default since git.kde.org supports
     # cloning the module more reliably than gitorious. To use standard Qt as
     # provided by Nokia, comment the following line and uncomment the next
     # repository line.
-    repository git://anongit.kde.org/qt
+    repository kde:qt
 
     # Nokia's Qt. Note that gitorious has had known issues checking out large
     # git modules such as Qt. If there are failures try using KDE's qt (see
diff --git a/kdesrc-buildrc-sample b/kdesrc-buildrc-sample
index 46de0ce..3292bbd 100644
--- a/kdesrc-buildrc-sample
+++ b/kdesrc-buildrc-sample
@@ -101,7 +101,7 @@ module qt-copy
 # - Alternatively, if you use Qt's phonon, remove "phonon" from the use-modules
 #   option in the module-set below.
 # - As of KDE 4.6/Qt 4.7 the "right answer" is the first option: separate phonon.
-	configure-flags -fast -debug -no-separate-debug-info \
+	configure-flags -fast -debug \
 	                -system-zlib -system-libpng -system-libjpeg \
 	                -dbus -webkit -plugin-sql-mysql \
 	                -nomake examples -nomake demos \