From 27be9b0b51e2143a4868fd06e9554f45febe2c72 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Thu, 10 Nov 2011 17:46:14 -0500 Subject: [PATCH] contrib: qt4: only disable cde, motif, plastique and cleanlooks style This keeps windows and mac styles (for mac builds) --- contrib/src/qt4/rules.mak | 2 +- contrib/src/qt4/styles.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 contrib/src/qt4/styles.patch diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak index 3aa2e24607..973fcc26bf 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 0000000000..aa9a307913 --- /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 -- 2.39.2