diff --git a/SuperBuild/patches/QT4/configure_qt4.sh.in b/SuperBuild/patches/QT4/configure_qt4.sh.in index 3a5f509acfbe4ea2970f8c177cb7370e1e946409..7348ab338798049759a2d72d8db8ea04c912c152 100755 --- a/SuperBuild/patches/QT4/configure_qt4.sh.in +++ b/SuperBuild/patches/QT4/configure_qt4.sh.in @@ -1 +1 @@ -@QT4_SB_SRC@/configure -prefix @SB_INSTALL_PREFIX@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative -no-nis -no-javascript-jit -no-qt3support -no-xmlpatterns -plugin-sql-sqlite -no-libtiff -no-libmng -system-libjpeg -system-libpng -system-zlib -system-sqlite -L @SB_INSTALL_PREFIX@/lib -I @SB_INSTALL_PREFIX@/include -I @SB_INSTALL_PREFIX@/include/freetype2 -no-openssl @QT4_SB_CONFIG@ -v +@QT4_SB_SRC@/configure -prefix @SB_INSTALL_PREFIX@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative -no-nis -no-javascript-jit -no-qt3support -no-xmlpatterns -plugin-sql-sqlite -no-libtiff -no-libmng -system-libjpeg -system-libpng -system-zlib -system-sqlite -L @SB_INSTALL_PREFIX@/lib -I @SB_INSTALL_PREFIX@/include -I @SB_INSTALL_PREFIX@/include/freetype2 -no-openssl -no-declarative @QT4_SB_CONFIG@ -v diff --git a/SuperBuild/patches/QT4/qt4-1-skip-qtnetwork-module-all.diff b/SuperBuild/patches/QT4/qt4-1-skip-qtnetwork-module-all.diff new file mode 100755 index 0000000000000000000000000000000000000000..215f87cecafdb32d103dfa8cd7f9b5bd3de03734 --- /dev/null +++ b/SuperBuild/patches/QT4/qt4-1-skip-qtnetwork-module-all.diff @@ -0,0 +1,32 @@ +diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/graphicssystems.pro qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro +--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/graphicssystems.pro 2016-07-06 10:15:46.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro 2016-07-06 14:09:07.000000000 +0200 +@@ -1,5 +1,4 @@ + TEMPLATE = subdirs +-SUBDIRS += trace + !wince*:contains(QT_CONFIG, opengl):SUBDIRS += opengl + contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) { + SUBDIRS += openvg +diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro +--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro 2016-07-06 10:15:46.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro 2016-07-06 12:58:14.000000000 +0200 +@@ -1,6 +1,6 @@ + TEMPLATE = subdirs + +-SUBDIRS *= sqldrivers script bearer ++SUBDIRS *= sqldrivers + unix:!symbian { + contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs + } else { +diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/src.pro qt-everywhere-opensource-src-4.8.7/src/src.pro +--- qt-everywhere-opensource-src-4.8.7.orig/src/src.pro 2016-07-06 10:15:47.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.7/src/src.pro 2016-07-06 10:18:44.000000000 +0200 +@@ -4,7 +4,7 @@ + unset(SRC_SUBDIRS) + win32:SRC_SUBDIRS += src_winmain + symbian:SRC_SUBDIRS += src_s60main +-SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib ++SRC_SUBDIRS += src_corelib src_xml src_sql + nacl: SRC_SUBDIRS -= src_network src_testlib + !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus + !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui diff --git a/SuperBuild/patches/QT4/qt4-fix-rpath-for-macx.diff b/SuperBuild/patches/QT4/qt4-2-fix_rpath-macx.diff similarity index 100% rename from SuperBuild/patches/QT4/qt4-fix-rpath-for-macx.diff rename to SuperBuild/patches/QT4/qt4-2-fix_rpath-macx.diff