[vlc-commits] contribs: qt: Properly disable pch

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Aug 11 12:08:49 2016 +0200| [d1e58978023210258d093a9eb6ed306e457a259b] | committer: Hugo Beauzée-Luyssen

contribs: qt: Properly disable pch

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

 contrib/src/qt/pch.patch | 12 ------------
 contrib/src/qt/rules.mak |  3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/contrib/src/qt/pch.patch b/contrib/src/qt/pch.patch
deleted file mode 100644
index de9689f..0000000
--- a/contrib/src/qt/pch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN qt/mkspecs/win32-g++/qmake.conf qt.new/mkspecs/win32-g++/qmake.conf
---- qt/mkspecs/win32-g++/qmake.conf	2016-03-03 12:35:22.000000000 +0100
-+++ qt.new/mkspecs/win32-g++/qmake.conf	2016-08-06 11:33:47.010286322 +0200
-@@ -12,7 +12,7 @@
- 
- MAKEFILE_GENERATOR      = MINGW
- QMAKE_PLATFORM          = win32 mingw
--CONFIG                 += debug_and_release debug_and_release_target precompile_header
-+CONFIG                 += debug_and_release debug_and_release_target
- DEFINES                += UNICODE
- QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
- 
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 014a39e..3bfde9f 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -22,7 +22,6 @@ $(TARBALLS)/qt-$(QT_VERSION).tar.xz:
 qt: qt-$(QT_VERSION).tar.xz .sum-qt
 	$(UNPACK)
 	mv qtbase-opensource-src-$(QT_VERSION) qt-$(QT_VERSION)
-	$(APPLY) $(SRC)/qt/pch.patch
 	$(MOVE)
 
 ifdef HAVE_MACOSX
@@ -35,7 +34,7 @@ endif
 
 QT_CONFIG := -static -release -opensource -confirm-license -no-pkg-config \
 	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl -no-opengl -no-dbus \
-	-no-qml-debug -no-audio-backend -no-sql-odbc \
+	-no-qml-debug -no-audio-backend -no-sql-odbc -no-pch \
 	-no-compile-examples -nomake examples
 
 .qt: qt