[vlc-commits] contrib: qt4: only disable cde, motif, plastique and cleanlooks style

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Nov 10 17:46:14 2011 -0500| [27be9b0b51e2143a4868fd06e9554f45febe2c72] | committer: Rafaël Carré

contrib: qt4: only disable cde, motif, plastique and cleanlooks style

This keeps windows and mac styles (for mac builds)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=27be9b0b51e2143a4868fd06e9554f45febe2c72
---

 contrib/src/qt4/rules.mak    |    2 +-
 contrib/src/qt4/styles.patch |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 3aa2e24..973fcc2 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -20,7 +20,7 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
 qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(UNPACK)
 	patch -p0 < $(SRC)/qt4/cross.patch
-	sed -i.orig s/'QMakeVar add styles "cde mac motif plastique cleanlooks windows"'// qt-everywhere-opensource-src-4.7.4/configure
+	patch -p0 < $(SRC)/qt4/styles.patch
 	mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
 
 XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
diff --git a/contrib/src/qt4/styles.patch b/contrib/src/qt4/styles.patch
new file mode 100644
index 0000000..aa9a307
--- /dev/null
+++ b/contrib/src/qt4/styles.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.7.4/configure.orig	2011-11-10 17:44:02.427883340 -0500
++++ qt-everywhere-opensource-src-4.7.4/configure	2011-11-10 17:44:13.915940309 -0500
+@@ -584,7 +584,7 @@
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+ 
+-QMakeVar add styles "cde mac motif plastique cleanlooks windows"
++QMakeVar add styles "mac windows"
+ QMakeVar add decorations "default windows styled"
+ QMakeVar add mouse-drivers "pc"
+ if [ "$UNAME_SYSTEM" = "Linux" ] ; then