Commit 6c9606ec authored by Manuel Grizonnet's avatar Manuel Grizonnet

ENH: remove unused QT4 patches from Superbuild

parent 7e829fad
set SB_SAVE_INCLUDE=%INCLUDE%
set SB_SAVE_LIB=%LIB%
set INCLUDE=%INCLUDE%;@QT4_INCLUDE_PREFIX_NATIVE@;@QT4_INCLUDE_PREFIX_NATIVE@\freetype2
set LIB=%LIB%;@QT4_LIB_PREFIX_NATIVE@
@QT4_CONFIGURE_SCRIPT@ @QT4_SB_CONFIG@
set INCLUDE=%SB_SAVE_INCLUDE%
set LIB=%SB_SAVE_LIB%
@QT4_CONFIGURE_SCRIPT@ @QT4_SB_CONFIG@
diff -burN qt-everywhere-opensource-src-4.8.7.orig/config.tests/unix/freetype/freetype.pri qt-everywhere-opensource-src-4.8.7/config.tests/unix/freetype/freetype.pri
--- qt-everywhere-opensource-src-4.8.7.orig/config.tests/unix/freetype/freetype.pri 2017-08-18 10:54:50.327911982 +0200
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/freetype/freetype.pri 2017-08-23 15:20:17.132268013 +0200
@@ -1,5 +1,5 @@
!cross_compile {
- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+ TRY_INCLUDEPATHS = $$INCLUDEPATH $$QMAKE_INCDIR $$QMAKE_INCDIR_X11
# LSB doesn't allow using headers from /include or /usr/include
linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
for(p, TRY_INCLUDEPATHS) {
diff -burN qt-everywhere-opensource-src-4.8.7.orig/projects.pro qt-everywhere-opensource-src-4.8.7/projects.pro
--- qt-everywhere-opensource-src-4.8.7.orig/projects.pro 2017-08-18 10:54:46.519887277 +0200
+++ qt-everywhere-opensource-src-4.8.7/projects.pro 2017-08-23 15:20:03.224174152 +0200
@@ -11,7 +11,7 @@
symbian|integrity {
QT_BUILD_PARTS = libs tools examples demos
} else {
- QT_BUILD_PARTS = libs tools examples demos docs translations
+ QT_BUILD_PARTS = libs tools examples demos translations
}
} else { #make sure the order makes sense
contains(QT_BUILD_PARTS, translations) {
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pri qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri
--- qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pri 2017-08-18 10:54:45.407880063 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri 2017-08-23 15:20:03.292174610 +0200
@@ -4,7 +4,7 @@
SOURCES += $$PWD/qjpeghandler.cpp
contains(QT_CONFIG, system-jpeg) {
if(unix|win32-g++*): LIBS += -ljpeg
- else:win32: LIBS += libjpeg.lib
+ else:win32: LIBS += jpeg.lib
} else {
include($$PWD/../../3rdparty/libjpeg.pri)
}
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 2017-08-18 10:54:45.583881205 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro 2017-08-23 15:20:03.292174610 +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/imageformats/imageformats.pro qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imageformats.pro 2017-08-18 10:54:45.583881205 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro 2017-08-23 15:20:03.292174610 +0200
@@ -3,7 +3,7 @@
!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
!contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
!contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng
-contains(QT_CONFIG, svg):SUBDIRS += svg
+# contains(QT_CONFIG, svg):SUBDIRS += svg
!contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff
!contains(QT_CONFIG, no-ico):SUBDIRS += ico
!contains(QT_CONFIG, no-tga):SUBDIRS += tga
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 2017-08-18 10:54:45.599881309 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro 2017-08-23 15:20:03.292174610 +0200
@@ -1,16 +1,16 @@
TEMPLATE = subdirs
-SUBDIRS *= sqldrivers script bearer
-unix:!symbian {
- contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs
-} else {
- SUBDIRS *= codecs
-}
-!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
+# SUBDIRS *= sqldrivers
+# unix:!symbian {
+# contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs
+# } else {
+# SUBDIRS *= codecs
+# }
+!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats
!embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems
embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
-!win32:!embedded:!mac:!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS *= inputmethods
-!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
+# !win32:!embedded:!mac:!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS *= inputmethods
+# !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
contains(QT_CONFIG, phonon): SUBDIRS *= phonon
qpa:SUBDIRS += platforms
contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling
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 2017-08-18 10:54:46.487887069 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/src.pro 2017-08-23 15:20:03.292174610 +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
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
@@ -18,7 +18,7 @@
contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns
contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon
contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia
-contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
+# contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
contains(QT_CONFIG, script): SRC_SUBDIRS += src_script
contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative
contains(QT_CONFIG, webkit) {
@@ -52,8 +52,8 @@
src_sql.target = sub-sql
src_network.subdir = $$QT_SOURCE_TREE/src/network
src_network.target = sub-network
-src_svg.subdir = $$QT_SOURCE_TREE/src/svg
-src_svg.target = sub-svg
+# src_svg.subdir = $$QT_SOURCE_TREE/src/svg
+# src_svg.target = sub-svg
src_script.subdir = $$QT_SOURCE_TREE/src/script
src_script.target = sub-script
src_scripttools.subdir = $$QT_SOURCE_TREE/src/scripttools
@@ -89,7 +89,7 @@
src_xml.depends = src_corelib
src_xmlpatterns.depends = src_corelib src_network
src_dbus.depends = src_corelib src_xml
- src_svg.depends = src_corelib src_gui
+ # src_svg.depends = src_corelib src_gui
src_script.depends = src_corelib
src_scripttools.depends = src_script src_gui src_network
src_network.depends = src_corelib
@@ -105,7 +105,7 @@
contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl
src_activeqt.depends = src_tools_idc src_gui
src_declarative.depends = src_gui src_script src_network
- src_plugins.depends = src_gui src_sql src_svg
+ src_plugins.depends = src_gui
contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia
contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative
src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
@@ -130,9 +130,9 @@
src_declarative.depends += src_xmlpatterns
src_webkit.depends += src_xmlpatterns
}
- contains(QT_CONFIG, svg) {
- src_declarative.depends += src_svg
- }
+ # contains(QT_CONFIG, svg) {
+ # src_declarative.depends += src_svg
+ # }
}
diff -burN qt-everywhere-opensource-src-4.8.7.orig/mkspecs/macx-g++/qmake.conf qt-everywhere-opensource-src-4.8.7/mkspecs/macx-g++/qmake.conf
--- qt-everywhere-opensource-src-4.8.7.orig/mkspecs/macx-g++/qmake.conf 2016-04-18 17:22:33.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/mkspecs/macx-g++/qmake.conf 2016-04-18 17:24:36.000000000 +0200
@@ -16,4 +16,7 @@
include(../common/mac.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)
+
+QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+
load(qt_config)
diff -burN qt-everywhere-opensource-src-4.8.7.orig/qmake/generators/unix/unixmake2.cpp qt-everywhere-opensource-src-4.8.7/qmake/generators/unix/unixmake2.cpp
--- qt-everywhere-opensource-src-4.8.7.orig/qmake/generators/unix/unixmake2.cpp 2016-04-18 17:22:33.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/qmake/generators/unix/unixmake2.cpp 2016-04-18 17:23:46.000000000 +0200
@@ -1180,7 +1180,7 @@
QString instpath = Option::fixPathToTargetOS(project->first("target.path"));
if(!instpath.endsWith(Option::dir_sep))
instpath += Option::dir_sep;
- soname.prepend(instpath);
+// soname.prepend(instpath);
}
project->values("QMAKE_LFLAGS_SONAME").first() += escapeFilePath(soname);
}
diff -burN qt-everywhere-opensource-src-4.8.7.orig/mkspecs/common/linux.conf qt-everywhere-opensource-src-4.8.7/mkspecs/common/linux.conf
--- qt-everywhere-opensource-src-4.8.7.orig/mkspecs/common/linux.conf 2016-12-07 11:19:59.964124979 +0100
+++ qt-everywhere-opensource-src-4.8.7/mkspecs/common/linux.conf 2016-12-07 11:22:29.116132748 +0100
@@ -1,7 +1,7 @@
#
# qmake configuration for common linux
#
-
+QMAKE_CXXFLAGS += -w -std=c++98
QMAKE_CFLAGS_THREAD += -D_REENTRANT
QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
--- qt-everywhere-opensource-src-4.8.7.orig/src/gui/itemviews/qtreeview.cpp 2015-05-07 16:14:43.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/itemviews/qtreeview.cpp 2017-02-07 15:30:57.463689900 +0100
@@ -2261,10 +2261,23 @@
return;
d->executePostedLayout();
- QPoint tl(isRightToLeft() ? qMax(rect.left(), rect.right())
- : qMin(rect.left(), rect.right()), qMin(rect.top(), rect.bottom()));
- QPoint br(isRightToLeft() ? qMin(rect.left(), rect.right()) :
- qMax(rect.left(), rect.right()), qMax(rect.top(), rect.bottom()));
+ QPoint tl(rect.left(),rect.top());
+ QPoint br(rect.right(),rect.bottom());
+ if (isRightToLeft()) {
+ if (rect.left() < rect.right()) {
+ tl.setX(rect.right());
+ br.setX(rect.left());
+ }
+ } else {
+ if (rect.left() > rect.right()) {
+ tl.setX(rect.right());
+ br.setX(rect.left());
+ }
+ }
+ if (rect.bottom() < rect.top()) {
+ tl.setY(rect.bottom());
+ br.setY(rect.top());
+ }
QModelIndex topLeft = indexAt(tl);
QModelIndex bottomRight = indexAt(br);
if (!topLeft.isValid() && !bottomRight.isValid()) {
--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/thread/qthread_unix.cpp 2015-11-23 19:05:40.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/corelib/thread/qthread_unix.cpp 2015-11-24 11:22:31.000000000 +0100
@@ -79,6 +79,7 @@
#endif
#if defined(Q_OS_MAC)
+#include <sys/resource.h> // getrlimit/setrlimit
# ifdef qDebug
# define old_qDebug qDebug
# undef qDebug
@@ -649,6 +650,45 @@
#endif // QT_HAS_THREAD_PRIORITY_SCHEDULING
+#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
+ if (d->stackSize == 0) {
+ // Fix the default (too small) stack size for threads on OS X,
+ // which also affects the thread pool.
+ // See also:
+ // https://bugreports.qt.io/browse/QTBUG-2568
+ // This fix can also be found in Chromium:
+ // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186
+
+ // The Mac OS X default for a pthread stack size is 512kB.
+ // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses
+ // DEFAULT_STACK_SIZE for this purpose.
+ //
+ // 512kB isn't quite generous enough for some deeply recursive threads that
+ // otherwise request the default stack size by specifying 0. Here, adopt
+ // glibc's behavior as on Linux, which is to use the current stack size
+ // limit (ulimit -s) as the default stack size. See
+ // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To
+ // avoid setting the limit below the Mac OS X default or the minimum usable
+ // stack size, these values are also considered. If any of these values
+ // can't be determined, or if stack size is unlimited (ulimit -s unlimited),
+ // stack_size is left at 0 to get the system default.
+ //
+ // Mac OS X normally only applies ulimit -s to the main thread stack. On
+ // contemporary OS X and Linux systems alike, this value is generally 8MB
+ // or in that neighborhood.
+ size_t default_stack_size = 0;
+ struct rlimit stack_rlimit;
+ if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 &&
+ getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 &&
+ stack_rlimit.rlim_cur != RLIM_INFINITY) {
+ default_stack_size =
+ std::max(std::max(default_stack_size,
+ static_cast<size_t>(PTHREAD_STACK_MIN)),
+ static_cast<size_t>(stack_rlimit.rlim_cur));
+ }
+ d->stackSize = default_stack_size;
+ }
+#endif
if (d->stackSize > 0) {
#if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0)
int code = pthread_attr_setstacksize(&attr, d->stackSize);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment