Browse Source

re-enable XmlPatterns support for the static build

This is required for the TOC support (which uses XSL stylesheets) and was
removed by mistake in 303957c66a56225a5aeb5f7312dcfbf851f4847b.
Ashish Kulkarni 11 years ago
parent
commit
9903f91f4a
3 changed files with 5 additions and 5 deletions
  1. 1 1
      build_linux.sh
  2. 3 3
      build_msvc.cmd
  3. 1 1
      common.pri

+ 1 - 1
build_linux.sh

@@ -82,7 +82,7 @@ if [ ! -f \$DST/qt/bin/qmake ]; then
 	cd \$BLD/qt
 	\$SRC/qt/configure -opensource -confirm-license -fast -release -static -graphicssystem raster -exceptions \\
 		-no-accessibility -no-stl -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \\
-		-no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend -no-opengl -no-declarative -no-script -no-scripttools \\
+		-no-qt3support -xmlpatterns -no-phonon -no-phonon-backend -no-opengl -no-declarative -no-script -no-scripttools \\
 		-no-mmx -no-3dnow -no-sse -no-sse2 -no-multimedia -no-dbus -qt-zlib -qt-libpng -qt-libjpeg -no-libmng -no-libtiff \\
 		-openssl -xrender -webkit -largefile -rpath --prefix=\$DST/qt \\
 		-nomake demos -nomake docs -nomake examples -nomake tools -nomake tests -nomake translations \\

+ 3 - 3
build_msvc.cmd

@@ -81,7 +81,7 @@ set QT_CFG=%QT_CFG% -release
 set QT_CFG=%QT_CFG% -static
 set QT_CFG=%QT_CFG% -graphicssystem raster
 set QT_CFG=%QT_CFG% -mp
-set QT_CFG=%QT_CFG% -no-exceptions
+set QT_CFG=%QT_CFG% -exceptions
 set QT_CFG=%QT_CFG% -no-accessibility
 set QT_CFG=%QT_CFG% -no-stl
 set QT_CFG=%QT_CFG% -no-sql-ibase
@@ -91,7 +91,7 @@ set QT_CFG=%QT_CFG% -no-sql-psql
 set QT_CFG=%QT_CFG% -no-sql-sqlite
 set QT_CFG=%QT_CFG% -no-sql-sqlite2
 set QT_CFG=%QT_CFG% -no-qt3support
-set QT_CFG=%QT_CFG% -no-xmlpatterns
+set QT_CFG=%QT_CFG% -xmlpatterns
 set QT_CFG=%QT_CFG% -no-phonon
 set QT_CFG=%QT_CFG% -no-phonon-backend
 set QT_CFG=%QT_CFG% -no-qt3support
@@ -129,7 +129,7 @@ set QT_CFG=%QT_CFG% -I %BUILD_DIR%\openssl_dist\include
 set QT_CFG=%QT_CFG% -L %BUILD_DIR%\openssl_dist\lib
 set QT_CFG=%QT_CFG% -l libeay32
 set QT_CFG=%QT_CFG% -l ssleay32
-set QT_CFG=%QT_CFG% OPENSSL_LIBS="-L%BUILD_DIR%\openssl_dist\lib -lssleay32 -llibeay32 -lUser32 -lAdvapi32 -lGdi32 -lCrypt32"
+set QT_CFG=%QT_CFG% OPENSSL_LIBS="-L%BUILD_DIR:\=\\%\\openssl_dist\\lib -lssleay32 -llibeay32 -lUser32 -lAdvapi32 -lGdi32 -lCrypt32"
 
 %BUILD_DIR%\..\qt\configure %QT_CFG%
 nmake

+ 1 - 1
common.pri

@@ -45,7 +45,7 @@ win32 {
     CONFIG += console
 }
 
-QT += webkit network svg
+QT += webkit network xmlpatterns svg
 
 # version related information
 VERSION_TEXT=$$cat($$PWD/VERSION)