diff --git a/repos/libports/lib/mk/qt5_core_generated.inc b/repos/libports/lib/mk/qt5_core_generated.inc index 9c5d7066d..f2d224006 100644 --- a/repos/libports/lib/mk/qt5_core_generated.inc +++ b/repos/libports/lib/mk/qt5_core_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_USE_ICU -DQT_BUILD_CORE_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_DEBUG +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_USE_ICU -DQT_HAVE_POLL -DQT_BUILD_CORE_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_DEBUG QT_INCPATH += \ qtbase/src/corelib \ @@ -7,11 +7,13 @@ QT_INCPATH += \ qtbase/src/3rdparty/md5 \ qtbase/src/3rdparty/md4 \ qtbase/src/3rdparty/sha3 \ + qtbase/src/3rdparty/double-conversion/include \ + qtbase/src/3rdparty/double-conversion/include/double-conversion \ qtbase/src/3rdparty/forkfd \ qtbase/include \ qtbase/include/QtCore \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/mkspecs/genode-g++ QT_SOURCES += \ @@ -22,7 +24,6 @@ QT_SOURCES += \ qsequentialanimationgroup.cpp \ qparallelanimationgroup.cpp \ qpauseanimation.cpp \ - qatomic_unix.cpp \ qglobal.cpp \ qglobalstatic.cpp \ qlibraryinfo.cpp \ @@ -106,6 +107,14 @@ QT_SOURCES += \ harfbuzz-stream.c \ harfbuzz-shaper-all.cpp \ qharfbuzz.cpp \ + bignum.cc \ + bignum-dtoa.cc \ + cached-powers.cc \ + diy-fp.cc \ + double-conversion.cc \ + fast-dtoa.cc \ + fixed-dtoa.cc \ + strtod.cc \ qabstractfileengine.cpp \ qbuffer.cpp \ qdatastream.cpp \ @@ -275,9 +284,9 @@ QT_SOURCES += \ moc_qeventtransition.cpp QT_VPATH += \ + qtbase/src/3rdparty/double-conversion \ qtbase/src/3rdparty/harfbuzz/src \ qtbase/src/corelib/animation \ - qtbase/src/corelib/arch \ qtbase/src/corelib/codecs \ qtbase/src/corelib/global \ qtbase/src/corelib/io \ diff --git a/repos/libports/lib/mk/qt5_gui.mk b/repos/libports/lib/mk/qt5_gui.mk index a438b507b..0a5a0a39f 100644 --- a/repos/libports/lib/mk/qt5_gui.mk +++ b/repos/libports/lib/mk/qt5_gui.mk @@ -54,4 +54,4 @@ endif $(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts: $(VERBOSE)mkdir -p $@ - $(VERBOSE)ln -sf $(QT5_CONTRIB_DIR)/qtbase/lib/fonts/DejaVuSans.ttf $@/ + $(VERBOSE)ln -sf $(QT5_CONTRIB_DIR)/qtquickcontrols/examples/quickcontrols/extras/dashboard/fonts/DejaVuSans.ttf $@/ diff --git a/repos/libports/lib/mk/qt5_gui_generated.inc b/repos/libports/lib/mk/qt5_gui_generated.inc index 8ef404619..02f0d2a7f 100644 --- a/repos/libports/lib/mk/qt5_gui_generated.inc +++ b/repos/libports/lib/mk/qt5_gui_generated.inc @@ -4,10 +4,10 @@ QT_INCPATH += \ qtbase/src/gui \ qtbase/include \ qtbase/include/QtGui \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ @@ -281,6 +281,7 @@ QT_SOURCES += \ moc_qvalidator.cpp \ moc_qopenglshaderprogram.cpp \ moc_qopenglengineshadermanager_p.cpp \ + moc_qopengltexture.cpp \ moc_qopengltimerquery.cpp QT_VPATH += \ @@ -357,6 +358,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qopenglengineshadermanager_p.cpp \ moc_qopenglvertexarrayobject.cpp \ moc_qopengldebug.cpp \ + moc_qopengltexture.cpp \ moc_qopengltimerquery.cpp \ moc_qstandarditemmodel.cpp diff --git a/repos/libports/lib/mk/qt5_host_tools.inc b/repos/libports/lib/mk/qt5_host_tools.inc index 931e5541b..034b38230 100644 --- a/repos/libports/lib/mk/qt5_host_tools.inc +++ b/repos/libports/lib/mk/qt5_host_tools.inc @@ -6,19 +6,19 @@ QMAKESPEC = $(QT5_CONTRIB_DIR)/qtbase/mkspecs/linux-g++ bootstrap/libQtBootstrap.a: bootstrap/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C bootstrap \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_NO_CAST_FROM_ASCII -DQT_BUILD_BOOTSTRAP_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG" + DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_NO_FOREACH -DQT_NO_CAST_FROM_ASCII -DQT_BUILD_BOOTSTRAP_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG" moc/moc: bootstrap/libQtBootstrap.a moc/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C moc \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_MOC -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_COMPRESS -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" + DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_MOC -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_COMPRESS -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" rcc/rcc: bootstrap/libQtBootstrap.a rcc/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C rcc \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_RCC -DQT_NO_CAST_FROM_ASCII -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" + DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_RCC -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" uic/uic: bootstrap/libQtBootstrap.a uic/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C uic \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_UIC -DQT_NO_CAST_FROM_ASCII -DQT_UIC_CPP_GENERATOR -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" + DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_UIC -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_UIC_CPP_GENERATOR -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" # # Rule to generate tool Makefiles from the respective pro files via qmake @@ -32,14 +32,15 @@ uic/uic: bootstrap/libQtBootstrap.a uic/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) qmake/bin/qmake -o $*/Makefile \ QT_BUILD_TREE=$(QT5_CONTRIB_DIR)/qtbase \ QT_CONFIG+=zlib \ + QMAKE_CXXFLAGS=-std=c++11 \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore \ INCLUDEPATH+=$(REP_DIR)/src/lib/qt5/qtbase/src/corelib/global \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.6.2 \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.6.2/QtCore \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.7.1 \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.7.1/QtCore \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml/5.6.2/QtXml \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml/5.7.1/QtXml \ -after DESTDIR= \ -after "LIBS+=-lQtBootstrap -L../bootstrap" \ $^ diff --git a/repos/libports/lib/mk/qt5_host_tools_qmake.inc b/repos/libports/lib/mk/qt5_host_tools_qmake.inc index 735554f56..1c65b7cee 100644 --- a/repos/libports/lib/mk/qt5_host_tools_qmake.inc +++ b/repos/libports/lib/mk/qt5_host_tools_qmake.inc @@ -18,6 +18,7 @@ CXX = g++ QMAKE_CFLAGS = -pipe QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_CXXFLAGS = -pipe +QMAKE_CXXFLAGS_CXX11 = -std=c++11 QMAKE_CXXFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_LFLAGS = QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections @@ -28,12 +29,12 @@ BUILD_PATH = . SOURCE_PATH = $(QT5_CONTRIB_DIR)/qtbase INC_PATH = $(SOURCE_PATH)/include QMAKESPEC = $(SOURCE_PATH)/mkspecs/linux-g++ -QT_VERSION = 5.6.2 +QT_VERSION = 5.7.1 QT_MAJOR_VERSION = 5 -QT_MINOR_VERSION = 6 -QT_PATCH_VERSION = 2 +QT_MINOR_VERSION = 7 +QT_PATCH_VERSION = 1 EXTRA_CFLAGS = $(QMAKE_CFLAGS) $(QMAKE_CFLAGS_SPLIT_SECTIONS) $(QMAKE_CFLAGS_RELEASE) -EXTRA_CXXFLAGS = $(QMAKE_CXXFLAGS) $(QMAKE_CXXFLAGS_SPLIT_SECTIONS) $(QMAKE_CXXFLAGS_RELEASE) +EXTRA_CXXFLAGS = $(QMAKE_CXXFLAGS) $(QMAKE_CXXFLAGS_CXX11) $(QMAKE_CXXFLAGS_SPLIT_SECTIONS) $(QMAKE_CXXFLAGS_RELEASE) QTOBJS = qfilesystemengine_unix.o qfilesystemiterator_unix.o qfsfileengine_unix.o qlocale_unix.o QTSRCS = "$(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp" "$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp" "$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp" "$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp" LFLAGS = $(QMAKE_LFLAGS) $(QMAKE_LFLAGS_GCSECTIONS) diff --git a/repos/libports/lib/mk/qt5_network_generated.inc b/repos/libports/lib/mk/qt5_network_generated.inc index 4c932040c..b26d83e75 100644 --- a/repos/libports/lib/mk/qt5_network_generated.inc +++ b/repos/libports/lib/mk/qt5_network_generated.inc @@ -1,14 +1,14 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_BUILD_NETWORK_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_BUILD_NETWORK_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB QT_INCPATH += \ qtbase/src/network \ qtbase/src/network/kernel \ qtbase/include \ qtbase/include/QtNetwork \ - qtbase/include/QtNetwork/5.6.2 \ - qtbase/include/QtNetwork/5.6.2/QtNetwork \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtNetwork/5.7.1 \ + qtbase/include/QtNetwork/5.7.1/QtNetwork \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_opengl_generated.inc b/repos/libports/lib/mk/qt5_opengl_generated.inc index 75bc583f5..7eef93b96 100644 --- a/repos/libports/lib/mk/qt5_opengl_generated.inc +++ b/repos/libports/lib/mk/qt5_opengl_generated.inc @@ -1,17 +1,17 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_BUILD_OPENGL_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_BUILD_OPENGL_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB QT_INCPATH += \ qtbase/src/opengl \ qtbase/include \ qtbase/include/QtOpenGL \ - qtbase/include/QtOpenGL/5.6.2 \ - qtbase/include/QtOpenGL/5.6.2/QtOpenGL \ - qtbase/include/QtWidgets/5.6.2 \ - qtbase/include/QtWidgets/5.6.2/QtWidgets \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtOpenGL/5.7.1 \ + qtbase/include/QtOpenGL/5.7.1/QtOpenGL \ + qtbase/include/QtWidgets/5.7.1 \ + qtbase/include/QtWidgets/5.7.1/QtWidgets \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtWidgets \ qtbase/include/QtGui \ qtbase/include/QtCore \ diff --git a/repos/libports/lib/mk/qt5_printsupport_generated.inc b/repos/libports/lib/mk/qt5_printsupport_generated.inc index 28a15d6ba..a3a95b98a 100644 --- a/repos/libports/lib/mk/qt5_printsupport_generated.inc +++ b/repos/libports/lib/mk/qt5_printsupport_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_BUILD_PRINTSUPPORT_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_BUILD_PRINTSUPPORT_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB QT_INCPATH += \ qtbase/src/printsupport \ @@ -6,14 +6,14 @@ QT_INCPATH += \ qtbase/src/printsupport/dialogs \ qtbase/include \ qtbase/include/QtPrintSupport \ - qtbase/include/QtPrintSupport/5.6.2 \ - qtbase/include/QtPrintSupport/5.6.2/QtPrintSupport \ - qtbase/include/QtWidgets/5.6.2 \ - qtbase/include/QtWidgets/5.6.2/QtWidgets \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtPrintSupport/5.7.1 \ + qtbase/include/QtPrintSupport/5.7.1/QtPrintSupport \ + qtbase/include/QtWidgets/5.7.1 \ + qtbase/include/QtWidgets/5.7.1/QtWidgets \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtWidgets \ qtbase/include/QtGui \ qtbase/include/QtCore \ diff --git a/repos/libports/lib/mk/qt5_qml_generated.inc b/repos/libports/lib/mk/qt5_qml_generated.inc index a0b071135..098f3c641 100644 --- a/repos/libports/lib/mk/qt5_qml_generated.inc +++ b/repos/libports/lib/mk/qt5_qml_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DWTF_EXPORT_PRIVATE= -DJS_EXPORT_PRIVATE= -DWTFReportAssertionFailure=qmlWTFReportAssertionFailure -DWTFReportBacktrace=qmlWTFReportBacktrace -DWTFInvokeCrashHook=qmlWTFInvokeCrashHook -DENABLE_LLINT=0 -DENABLE_DFG_JIT=0 -DENABLE_DFG_JIT_UTILITY_METHODS=1 -DENABLE_JIT_CONSTANT_BLINDING=0 -DBUILDING_QT__ -DWTF_USE_UDIS86=0 -DNDEBUG -DQT_BUILD_QML_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DWTF_EXPORT_PRIVATE= -DJS_EXPORT_PRIVATE= -DENABLE_ASSEMBLER_WX_EXCLUSIVE=1 -DWTFReportAssertionFailure=qmlWTFReportAssertionFailure -DWTFReportBacktrace=qmlWTFReportBacktrace -DWTFInvokeCrashHook=qmlWTFInvokeCrashHook -DENABLE_LLINT=0 -DENABLE_DFG_JIT=0 -DENABLE_DFG_JIT_UTILITY_METHODS=1 -DENABLE_JIT_CONSTANT_BLINDING=0 -DBUILDING_QT__ -DWTF_USE_UDIS86=0 -DNDEBUG -DQT_BUILD_QML_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB QT_INCPATH += \ qtdeclarative/src/qml \ @@ -15,15 +15,14 @@ QT_INCPATH += \ qtdeclarative/src/3rdparty/masm/disassembler/udis86 \ qtdeclarative/src/qml/jit \ qtdeclarative/src/qml/jsruntime \ - qtdeclarative/src/3rdparty/double-conversion \ qtdeclarative/src/qml/debugger \ qtdeclarative/src/qml/animations \ qtdeclarative/include \ qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQml/5.6.2 \ - qtdeclarative/include/QtQml/5.6.2/QtQml \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtdeclarative/include/QtQml/5.7.1 \ + qtdeclarative/include/QtQml/5.7.1/QtQml \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include \ qtbase/include/QtNetwork \ qtbase/include/QtCore \ @@ -75,6 +74,8 @@ QT_SOURCES += \ ARMv7DOpcode.cpp \ Mips32Disassembler.cpp \ Mips32Opcode.cpp \ + ARM64Disassembler.cpp \ + A64DOpcode.cpp \ YarrCanonicalizeUCS2.cpp \ YarrInterpreter.cpp \ YarrJIT.cpp \ @@ -124,14 +125,6 @@ QT_SOURCES += \ qv4runtime.cpp \ qv4string.cpp \ qv4value.cpp \ - bignum.cc \ - bignum-dtoa.cc \ - cached-powers.cc \ - diy-fp.cc \ - double-conversion.cc \ - fast-dtoa.cc \ - fixed-dtoa.cc \ - strtod.cc \ qqmlopenmetaobject.cpp \ qqmlvmemetaobject.cpp \ qqmlengine.cpp \ @@ -252,9 +245,9 @@ QT_SOURCES += \ moc_qquickworkerscript_p.cpp QT_VPATH += \ - qtdeclarative/src/3rdparty/double-conversion \ qtdeclarative/src/3rdparty/masm/assembler \ qtdeclarative/src/3rdparty/masm/disassembler \ + qtdeclarative/src/3rdparty/masm/disassembler/ARM64 \ qtdeclarative/src/3rdparty/masm/disassembler/ARMv7 \ qtdeclarative/src/3rdparty/masm/disassembler/mips32 \ qtdeclarative/src/3rdparty/masm/stubs \ diff --git a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc index 06a566a54..ec962298b 100644 --- a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc +++ b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc @@ -2,18 +2,18 @@ QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_ QT_INCPATH += \ qtdeclarative/src/imports/qtquick2 \ - qtdeclarative/include/QtQuick/5.6.2 \ - qtdeclarative/include/QtQuick/5.6.2/QtQuick \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ + qtdeclarative/include/QtQuick/5.7.1 \ + qtdeclarative/include/QtQuick/5.7.1/QtQuick \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ qtdeclarative/include \ qtdeclarative/include/QtQuick \ qtbase/include \ qtbase/include/QtGui \ - qtdeclarative/include/QtQml/5.6.2 \ - qtdeclarative/include/QtQml/5.6.2/QtQml \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtdeclarative/include/QtQml/5.7.1 \ + qtdeclarative/include/QtQml/5.7.1/QtQml \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtdeclarative/include/QtQml \ qtbase/include/QtNetwork \ qtbase/include/QtCore \ diff --git a/repos/libports/lib/mk/qt5_quick_generated.inc b/repos/libports/lib/mk/qt5_quick_generated.inc index f6c47f8b5..c20abc790 100644 --- a/repos/libports/lib/mk/qt5_quick_generated.inc +++ b/repos/libports/lib/mk/qt5_quick_generated.inc @@ -5,14 +5,14 @@ QT_INCPATH += \ qtdeclarative/src/quick \ qtdeclarative/include \ qtdeclarative/include/QtQuick \ - qtdeclarative/include/QtQuick/5.6.2 \ - qtdeclarative/include/QtQuick/5.6.2/QtQuick \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ - qtdeclarative/include/QtQml/5.6.2 \ - qtdeclarative/include/QtQml/5.6.2/QtQml \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtdeclarative/include/QtQuick/5.7.1 \ + qtdeclarative/include/QtQuick/5.7.1/QtQuick \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ + qtdeclarative/include/QtQml/5.7.1 \ + qtdeclarative/include/QtQml/5.7.1/QtQml \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include \ qtbase/include/QtGui \ qtdeclarative/include/QtQml \ diff --git a/repos/libports/lib/mk/qt5_sql_generated.inc b/repos/libports/lib/mk/qt5_sql_generated.inc index 6c7f77c57..691627b6b 100644 --- a/repos/libports/lib/mk/qt5_sql_generated.inc +++ b/repos/libports/lib/mk/qt5_sql_generated.inc @@ -1,13 +1,13 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -DQT_BUILD_SQL_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_BUILD_SQL_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB QT_INCPATH += \ qtbase/src/sql \ qtbase/include \ qtbase/include/QtSql \ - qtbase/include/QtSql/5.6.2 \ - qtbase/include/QtSql/5.6.2/QtSql \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtSql/5.7.1 \ + qtbase/include/QtSql/5.7.1/QtSql \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_ui_tools_generated.inc b/repos/libports/lib/mk/qt5_ui_tools_generated.inc index 14fb81620..6f875bce7 100644 --- a/repos/libports/lib/mk/qt5_ui_tools_generated.inc +++ b/repos/libports/lib/mk/qt5_ui_tools_generated.inc @@ -5,8 +5,8 @@ QT_INCPATH += \ qttools/src/designer/src/lib/uilib \ qttools/include \ qttools/include/QtUiTools \ - qttools/include/QtUiTools/5.6.2 \ - qttools/include/QtUiTools/5.6.2/QtUiTools \ + qttools/include/QtUiTools/5.7.1 \ + qttools/include/QtUiTools/5.7.1/QtUiTools \ qtbase/include \ qtbase/include/QtWidgets \ qtbase/include/QtGui \ diff --git a/repos/libports/lib/mk/qt5_version.inc b/repos/libports/lib/mk/qt5_version.inc index c8fdaf5b4..86c558d84 100644 --- a/repos/libports/lib/mk/qt5_version.inc +++ b/repos/libports/lib/mk/qt5_version.inc @@ -1,2 +1,2 @@ -QT_VERSION := 5.6.2 +QT_VERSION := 5.7.1 QT5 := qt-everywhere-opensource-src-$(QT_VERSION) diff --git a/repos/libports/lib/mk/qt5_webcore_generated.inc b/repos/libports/lib/mk/qt5_webcore_generated.inc index b504bfee5..9880824b0 100644 --- a/repos/libports/lib/mk/qt5_webcore_generated.inc +++ b/repos/libports/lib/mk/qt5_webcore_generated.inc @@ -6,6 +6,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/Modules/filesystem \ qtwebkit/Source/WebCore/Modules/geolocation \ qtwebkit/Source/WebCore/Modules/indexeddb \ + qtwebkit/Source/WebCore/Modules/mediasource \ qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ qtwebkit/Source/WebCore/Modules/notifications \ qtwebkit/Source/WebCore/Modules/proximity \ @@ -122,14 +123,14 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/API \ qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ qtwebkit/Source/WTF \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ qtbase/include \ qtbase/include/QtGui \ qtbase/include/QtNetwork \ qtbase/include/QtSql \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_webkit_generated.inc b/repos/libports/lib/mk/qt5_webkit_generated.inc index 7c38410d5..ad56bcf8a 100644 --- a/repos/libports/lib/mk/qt5_webkit_generated.inc +++ b/repos/libports/lib/mk/qt5_webkit_generated.inc @@ -11,6 +11,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/Modules/filesystem \ qtwebkit/Source/WebCore/Modules/geolocation \ qtwebkit/Source/WebCore/Modules/indexeddb \ + qtwebkit/Source/WebCore/Modules/mediasource \ qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ qtwebkit/Source/WebCore/Modules/notifications \ qtwebkit/Source/WebCore/Modules/proximity \ @@ -123,14 +124,14 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/API \ qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ qtwebkit/Source/WTF \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ qtbase/include \ qtbase/include/QtGui \ qtbase/include/QtNetwork \ qtbase/include/QtSql \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc index f2627ef8d..ba50260f4 100644 --- a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc +++ b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc @@ -16,6 +16,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/Modules/filesystem \ qtwebkit/Source/WebCore/Modules/geolocation \ qtwebkit/Source/WebCore/Modules/indexeddb \ + qtwebkit/Source/WebCore/Modules/mediasource \ qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ qtwebkit/Source/WebCore/Modules/notifications \ qtwebkit/Source/WebCore/Modules/proximity \ @@ -127,8 +128,8 @@ QT_INCPATH += \ qtwebkit/Source/WTF \ qtwebkit/include \ qtwebkit/include/QtWebKitWidgets \ - qtwebkit/include/QtWebKitWidgets/5.6.2 \ - qtwebkit/include/QtWebKitWidgets/5.6.2/QtWebKitWidgets \ + qtwebkit/include/QtWebKitWidgets/5.7.1 \ + qtwebkit/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets \ qtwebkit/Source/qt/Api \ qtwebkit/Source/qt/WebCoreSupport \ qtwebkit/Source \ @@ -138,12 +139,12 @@ QT_INCPATH += \ qtbase/include/QtGui \ qtbase/include/QtNetwork \ qtbase/include/QtCore \ - qtbase/include/QtWidgets/5.6.2 \ - qtbase/include/QtWidgets/5.6.2/QtWidgets \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtWidgets/5.7.1 \ + qtbase/include/QtWidgets/5.7.1/QtWidgets \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtPrintSupport \ qtbase/include/QtOpenGL \ qtbase/include/QtSql \ diff --git a/repos/libports/lib/mk/qt5_widgets_generated.inc b/repos/libports/lib/mk/qt5_widgets_generated.inc index eb215f993..599a53b3f 100644 --- a/repos/libports/lib/mk/qt5_widgets_generated.inc +++ b/repos/libports/lib/mk/qt5_widgets_generated.inc @@ -1,16 +1,16 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_STYLE_MAC -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_GTK -DQT_NO_STYLE_WINDOWSCE -DQT_NO_STYLE_WINDOWSMOBILE -DQT_NO_STYLE_ANDROID -DQT_BUILD_WIDGETS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_STYLE_MAC -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_WINDOWSCE -DQT_NO_STYLE_WINDOWSMOBILE -DQT_NO_STYLE_ANDROID -DQT_BUILD_WIDGETS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB QT_INCPATH += \ qtbase/src/widgets \ qtbase/src/widgets/dialogs \ qtbase/include \ qtbase/include/QtWidgets \ - qtbase/include/QtWidgets/5.6.2 \ - qtbase/include/QtWidgets/5.6.2/QtWidgets \ - qtbase/include/QtGui/5.6.2 \ - qtbase/include/QtGui/5.6.2/QtGui \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtWidgets/5.7.1 \ + qtbase/include/QtWidgets/5.7.1/QtWidgets \ + qtbase/include/QtGui/5.7.1 \ + qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtGui \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ @@ -54,6 +54,7 @@ QT_SOURCES += \ qstylepainter.cpp \ qstylesheetstyle.cpp \ qstylesheetstyle_default.cpp \ + qpixmapstyle.cpp \ qwindowsstyle.cpp \ qfusionstyle.cpp \ qbuttongroup.cpp \ @@ -187,7 +188,8 @@ QT_SOURCES += \ qgraphicseffect.cpp \ qpixmapfilter.cpp \ qrc_qstyle.cpp \ - qrc_qmessagebox.cpp + qrc_qmessagebox.cpp \ + moc_qpixmapstyle_p.cpp QT_VPATH += \ qtbase/src/widgets/dialogs \ @@ -233,6 +235,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qcommonstyle.cpp \ moc_qproxystyle.cpp \ moc_qstylesheetstyle_p.cpp \ + moc_qpixmapstyle_p.cpp \ moc_qwindowsstyle_p.cpp \ moc_qfusionstyle_p.cpp \ moc_qbuttongroup.cpp \ diff --git a/repos/libports/lib/mk/qt5_xml_generated.inc b/repos/libports/lib/mk/qt5_xml_generated.inc index 036844688..a8a51e6fd 100644 --- a/repos/libports/lib/mk/qt5_xml_generated.inc +++ b/repos/libports/lib/mk/qt5_xml_generated.inc @@ -1,13 +1,13 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_BUILD_XML_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_BUILD_XML_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB QT_INCPATH += \ qtbase/src/xml \ qtbase/include \ qtbase/include/QtXml \ - qtbase/include/QtXml/5.6.2 \ - qtbase/include/QtXml/5.6.2/QtXml \ - qtbase/include/QtCore/5.6.2 \ - qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtXml/5.7.1 \ + qtbase/include/QtXml/5.7.1/QtXml \ + qtbase/include/QtCore/5.7.1 \ + qtbase/include/QtCore/5.7.1/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index f160a7775..00721d6ed 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -26325684a0649f90e7b7760f326dae2f246e2f8a +fc3b60857d3d492f166712c8ac018df9b880acb1 diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port index bacf3ff98..98e6ddda9 100644 --- a/repos/libports/ports/qt5.port +++ b/repos/libports/ports/qt5.port @@ -1,5 +1,5 @@ LICENSE := GPL -VERSION := 5.6.2 +VERSION := 5.7.1 QT5 := qt-everywhere-opensource-src-${VERSION} QT5_WEBKIT := qtwebkit-opensource-src-$(VERSION) @@ -7,12 +7,12 @@ QTSCRIPTCLASSIC := qtscriptclassic-1.0_1-opensource DOWNLOADS := ${QT5}.archive ${QT5_WEBKIT}.archive ${QTSCRIPTCLASSIC}.archive -URL(${QT5}) := http://download.qt.io/archive/qt/5.6/$(VERSION)/single/$(QT5).tar.xz -SHA(${QT5}) := 42af05f2086c38a10ba1c707bbff7eca5fe55a22 +URL(${QT5}) := http://download.qt.io/archive/qt/5.7/$(VERSION)/single/$(QT5).tar.xz +SHA(${QT5}) := bedd61b2767239bad01fa9ce3d1e2e63ecf721bd DIR(${QT5}) := src/lib/qt5/${QT5} -URL(${QT5_WEBKIT}) := http://download.qt.io/community_releases/5.6/$(VERSION)/${QT5_WEBKIT}.tar.xz -SHA(${QT5_WEBKIT}) := 3dba4ec72c784f03ef4bf62a199cf4e7e49a6562 +URL(${QT5_WEBKIT}) := http://download.qt.io/community_releases/5.7/$(VERSION)/${QT5_WEBKIT}.tar.xz +SHA(${QT5_WEBKIT}) := cd44a529cf24cf6f9eda93ac88c7d65dc2de3359 DIR(${QT5_WEBKIT}) := src/lib/qt5/${QT5}/qtwebkit URL(${QTSCRIPTCLASSIC}) := ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.troll.no/QT/qt/solutions/lgpl/${QTSCRIPTCLASSIC}.tar.gz @@ -23,12 +23,13 @@ DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC} PATCHES_DIR := $(REP_DIR)/src/lib/qt5/patches QT5_PATCHES := $(shell cat $(PATCHES_DIR)/series) QT5_WEBKIT_PATCHES := qt5_qtwebkit_configuration.patch qt5_qtwebkit_generated_headers.patch qt5_qtwebkit.patch -QTSCRIPTCLASSIC_PATCHES := qtscriptclassic_qt5.patch +QTSCRIPTCLASSIC_PATCHES := qtscriptclassic_qt5.patch qtscriptclassic_qt5_7.patch PATCHES := $(addprefix src/lib/qt5/patches/, ${QT5_PATCHES} ${QT5_WEBKIT_PATCHES} ${QTSCRIPTCLASSIC_PATCHES}) -PATCH_OPT := -p1 -d ${DIR(${QT5})} -PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})} +PATCH_OPT := -p1 -d ${DIR(${QT5})} +PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})} +PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5_7.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})} $(call check_tool,bison) $(call check_tool,perl) diff --git a/repos/libports/src/lib/qt5/patches/qt5_configuration.patch b/repos/libports/src/lib/qt5/patches/qt5_configuration.patch index 61e5dfaca..f30e0253a 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_configuration.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_configuration.patch @@ -6,19 +6,19 @@ From: Christian Prochaska --- qtbase/configure | 98 +++--- qtbase/mkspecs/genode-g++/qmake.conf | 10 + - qtbase/mkspecs/genode-g++/qplatformdefs.h | 82 +++++ + qtbase/mkspecs/genode-g++/qplatformdefs.h | 87 ++++++ qtbase/src/corelib/global/qconfig-genode.h | 426 ++++++++++++++++++++++++++++ - qtdeclarative/tools/tools.pro | 5 - 5 files changed, 568 insertions(+), 53 deletions(-) + qtdeclarative/tools/tools.pro | 4 + 5 files changed, 573 insertions(+), 52 deletions(-) create mode 100644 qtbase/mkspecs/genode-g++/qmake.conf create mode 100644 qtbase/mkspecs/genode-g++/qplatformdefs.h create mode 100644 qtbase/src/corelib/global/qconfig-genode.h diff --git a/qtbase/configure b/qtbase/configure -index 0b8b417..1d8bd6b 100755 +index ba94d08..b11fb4c 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -633,10 +633,10 @@ CFG_MTDEV=auto +@@ -636,10 +636,10 @@ CFG_MTDEV=auto CFG_JOURNALD=no CFG_SYSLOG=no CFG_SQLITE=qt @@ -31,16 +31,16 @@ index 0b8b417..1d8bd6b 100755 CFG_LIBJPEG=auto CFG_XCURSOR=runtime CFG_XRANDR=runtime -@@ -743,7 +743,7 @@ CFG_GETADDRINFO=auto +@@ -748,7 +748,7 @@ CFG_GETADDRINFO=auto CFG_IPV6IFNAME=auto CFG_GETIFADDRS=auto CFG_INOTIFY=auto -CFG_EVENTFD=auto +CFG_EVENTFD=no CFG_CLOEXEC=no + CFG_POLL=auto CFG_RPATH=yes - CFG_FRAMEWORK=auto -@@ -5337,16 +5337,16 @@ elif [ "$CFG_OPENGL" = "es2" ]; then +@@ -5418,16 +5418,16 @@ elif [ "$CFG_OPENGL" = "es2" ]; then echo " ${XQMAKESPEC}." exit 1 fi @@ -67,7 +67,7 @@ index 0b8b417..1d8bd6b 100755 fi # If OpenGL ES 2.0 is enabled, check for 3.0 and higher. This is used to allow -@@ -5760,39 +5760,39 @@ else +@@ -5840,39 +5840,39 @@ else fi # EGL Support @@ -140,7 +140,7 @@ index 0b8b417..1d8bd6b 100755 if [ "$CFG_EGLFS" != "no" ]; then if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then -@@ -6064,9 +6064,9 @@ if [ "$CFG_GETIFADDRS" != "no" ]; then +@@ -6170,9 +6170,9 @@ if [ "$CFG_GETIFADDRS" != "no" ]; then fi # find if the platform provides thread-safe CLOEXEC support @@ -151,8 +151,8 @@ index 0b8b417..1d8bd6b 100755 +# CFG_CLOEXEC=yes +#fi - if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_SECURETRANSPORT" != "no" ] && ([ "$CFG_OPENSSL" = "no" ] || [ "$CFG_OPENSSL" = "auto" ]); then - CFG_SECURETRANSPORT=yes + if compileTest unix/ppoll "ppoll"; then + CFG_POLL="ppoll" diff --git a/qtbase/mkspecs/genode-g++/qmake.conf b/qtbase/mkspecs/genode-g++/qmake.conf new file mode 100644 index 0000000..734ae5c @@ -171,38 +171,44 @@ index 0000000..734ae5c +load(qt_config) diff --git a/qtbase/mkspecs/genode-g++/qplatformdefs.h b/qtbase/mkspecs/genode-g++/qplatformdefs.h new file mode 100644 -index 0000000..d4d67b0 +index 0000000..5e5c341 --- /dev/null +++ b/qtbase/mkspecs/genode-g++/qplatformdefs.h -@@ -0,0 +1,82 @@ +@@ -0,0 +1,87 @@ +/**************************************************************************** +** -+** Copyright (C) 2015 The Qt Company Ltd. -+** Contact: http://www.qt.io/licensing/ ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** -+** $QT_BEGIN_LICENSE:LGPL21$ ++** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see http://www.qt.io/terms-conditions. For further -+** information use the contact form at http://www.qt.io/contact-us. ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 or version 3 as published by the Free -+** Software Foundation and appearing in the file LICENSE.LGPLv21 and -+** LICENSE.LGPLv3 included in the packaging of this file. Please review the -+** following information to ensure the GNU Lesser General Public License -+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** -+** As a special exception, The Qt Company gives you certain additional -+** rights. These rights are described in The Qt Company LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** @@ -250,7 +256,6 @@ index 0000000..d4d67b0 +#include "../common/posix/qplatformdefs.h" + +#undef QT_OPEN_LARGEFILE -+ +#define QT_OPEN_LARGEFILE 0 + +#define QT_SNPRINTF ::snprintf @@ -690,15 +695,10 @@ index 0000000..56a0b73 +//# define QT_NO_VALIDATOR +//#endif diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro -index 96cf804..24432b3 100644 +index 18bfe28..ba3e5d4 100644 --- a/qtdeclarative/tools/tools.pro +++ b/qtdeclarative/tools/tools.pro -@@ -9,14 +9,11 @@ qmlimportscanner.CONFIG = host_build - !android|android_app { - SUBDIRS += \ - qml \ -- qmlprofiler \ - qmllint +@@ -16,9 +16,7 @@ qmlimportscanner.CONFIG = host_build qtHaveModule(quick) { !static: { SUBDIRS += \ diff --git a/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch b/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch index e68e17abd..d2474d4a9 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase/src/corelib/tools/qarraydata.cpp b/qtbase/src/corelib/tools/qarraydata.cpp -index eb6ce21..ba93eec 100644 +index 55af725..5a7ae60 100644 --- a/qtbase/src/corelib/tools/qarraydata.cpp +++ b/qtbase/src/corelib/tools/qarraydata.cpp -@@ -107,8 +107,8 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, +@@ -105,8 +105,8 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, QArrayData *header = static_cast(::malloc(allocSize)); if (header) { diff --git a/repos/libports/src/lib/qt5/patches/qt5_qml.patch b/repos/libports/src/lib/qt5/patches/qt5_qml.patch index d7a54d529..fa3ca7ef2 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qml.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qml.patch @@ -12,10 +12,10 @@ From: Christian Prochaska 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h -index df40a01..c3c5c51 100644 +index 2f48698..5c153bd 100644 --- a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h +++ b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h -@@ -47,6 +47,7 @@ +@@ -53,6 +53,7 @@ #include @@ -23,7 +23,7 @@ index df40a01..c3c5c51 100644 #if defined(Q_OS_WIN) # include # ifndef __GNUC__ -@@ -54,6 +55,9 @@ +@@ -60,6 +61,9 @@ # endif #elif !defined(Q_OS_BSD4) || defined(Q_OS_DARWIN) # include @@ -34,10 +34,10 @@ index df40a01..c3c5c51 100644 #endif diff --git a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -index 557b678..4051e6f 100644 +index 26f473a..d588abe 100644 --- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp +++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -@@ -94,6 +94,10 @@ +@@ -100,6 +100,10 @@ #include #endif @@ -49,23 +49,23 @@ index 557b678..4051e6f 100644 using namespace QV4; diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -index 960741d..c81f09f 100644 +index 184375a..597c680 100644 --- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h +++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -@@ -105,7 +105,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } +@@ -113,7 +113,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } // Black list some platforms #if defined(V4_ENABLE_JIT) --#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) -+#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) || defined(Q_OS_GENODE) +-#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) ++#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) || defined(Q_OS_GENODE) # undef V4_ENABLE_JIT #endif #endif diff --git a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h -index 8b0a587..5e22682 100644 +index 55562a5..c831908 100644 --- a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h +++ b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h -@@ -51,7 +51,7 @@ +@@ -57,7 +57,7 @@ #include #include @@ -75,10 +75,10 @@ index 8b0a587..5e22682 100644 #endif diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp -index dfdf2ed..940d556 100644 +index c1f5e75..5476249 100644 --- a/qtdeclarative/src/qml/qml/qqmlimport.cpp +++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp -@@ -1667,6 +1667,14 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, +@@ -1738,6 +1738,14 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, const QString &qmldirPath, const QString &qmldirPluginPath, const QString &baseName) { @@ -93,7 +93,7 @@ index dfdf2ed..940d556 100644 #if defined(Q_OS_WIN) return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, QStringList() -@@ -1691,6 +1699,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, +@@ -1762,6 +1770,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, # else // Unix return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, QStringList() << QLatin1String(".so"), QLatin1String("lib")); #endif diff --git a/repos/libports/src/lib/qt5/patches/qt5_qpa.patch b/repos/libports/src/lib/qt5/patches/qt5_qpa.patch index 6efe48cc3..540d3953e 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qpa.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qpa.patch @@ -11,10 +11,10 @@ From: Christian Prochaska 4 files changed, 32 insertions(+) diff --git a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -index 728b166..af957f7 100644 +index 4b9d469..ebf447a 100644 --- a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -@@ -72,7 +72,16 @@ void QBasicFontDatabase::populateFontDatabase() +@@ -79,7 +79,16 @@ void QBasicFontDatabase::populateFontDatabase() foreach (const QFileInfo &fi, dir.entryInfoList(nameFilters, QDir::Files)) { const QByteArray file = QFile::encodeName(fi.absoluteFilePath()); @@ -32,10 +32,10 @@ index 728b166..af957f7 100644 } diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -index 34f20f4..6e8bcbd 100644 +index bc04852..8394318 100644 --- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h +++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -@@ -46,7 +46,9 @@ +@@ -52,7 +52,9 @@ // #include "qnamespace.h" @@ -45,7 +45,7 @@ index 34f20f4..6e8bcbd 100644 // no QT_BEGIN_NAMESPACE, since we include it internally... -@@ -638,6 +640,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = { +@@ -644,6 +646,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = { { 111, 0xffff, 0x01000000, 0x06, 0x08, 0x0200 }, { 111, 0xffff, 0x01000000, 0x0c, 0x08, 0x0200 }, @@ -53,7 +53,7 @@ index 34f20f4..6e8bcbd 100644 // 113 -> 248 { KEY_MUTE, 0xffff, Qt::Key_VolumeMute, 0x00, 0x00, 0x0000 }, { KEY_VOLUMEDOWN, 0xffff, Qt::Key_VolumeDown, 0x00, 0x00, 0x0000 }, -@@ -666,6 +669,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = { +@@ -672,6 +675,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = { { KEY_BLUE, 0xffff, Qt::Key_Blue, 0x00, 0x00, 0x0000 }, { KEY_CHANNELUP, 0xffff, Qt::Key_ChannelUp, 0x00, 0x00, 0x0000 }, { KEY_CHANNELDOWN, 0xffff, Qt::Key_ChannelDown, 0x00, 0x00, 0x0000 }, @@ -62,10 +62,10 @@ index 34f20f4..6e8bcbd 100644 const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = { diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -index 089cc13..c8fb47c 100644 +index 0eb6fc0..cf19fec 100644 --- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -42,7 +42,9 @@ +@@ -49,7 +49,9 @@ #include #include @@ -75,27 +75,27 @@ index 089cc13..c8fb47c 100644 QT_BEGIN_NAMESPACE -@@ -67,9 +69,11 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, int fd, bool +@@ -81,9 +83,11 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, QFdContainer if (keymapFile.isEmpty() || !loadKeymap(keymapFile)) unloadKeymap(); +#ifndef Q_OS_GENODE // socket notifier for events on the keyboard device - m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); + m_notify = new QSocketNotifier(m_fd.get(), QSocketNotifier::Read, this); connect(m_notify, SIGNAL(activated(int)), this, SLOT(readKeycode())); +#endif /* Q_OS_GENODE */ } QEvdevKeyboardHandler::~QEvdevKeyboardHandler() -@@ -80,6 +84,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() - qt_safe_close(m_fd); +@@ -91,6 +95,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() + unloadKeymap(); } +#ifndef Q_OS_GENODE QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, const QString &specification, const QString &defaultKeymapFile) -@@ -205,10 +210,20 @@ void QEvdevKeyboardHandler::readKeycode() +@@ -214,10 +219,20 @@ void QEvdevKeyboardHandler::readKeycode() } } } @@ -116,7 +116,7 @@ index 089cc13..c8fb47c 100644 QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease), qtcode, modifiers, nativecode + 8, 0, int(modifiers), (unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat); -@@ -468,6 +483,7 @@ void QEvdevKeyboardHandler::unloadKeymap() +@@ -477,6 +492,7 @@ void QEvdevKeyboardHandler::unloadKeymap() m_composing = 0; m_dead_unicode = 0xffff; @@ -124,7 +124,7 @@ index 089cc13..c8fb47c 100644 //Set locks according to keyboard leds quint16 ledbits[1]; memset(ledbits, 0, sizeof(ledbits)); -@@ -488,6 +504,7 @@ void QEvdevKeyboardHandler::unloadKeymap() +@@ -497,6 +513,7 @@ void QEvdevKeyboardHandler::unloadKeymap() m_locks[2] = 1; qCDebug(qLcEvdevKey, "numlock=%d , capslock=%d, scrolllock=%d", m_locks[1], m_locks[0], m_locks[2]); } @@ -133,10 +133,10 @@ index 089cc13..c8fb47c 100644 bool QEvdevKeyboardHandler::loadKeymap(const QString &file) diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -index 84c251c..54c9cf3 100644 +index 1ec4915..fed7024 100644 --- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h +++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -@@ -171,8 +171,10 @@ public: +@@ -190,8 +190,10 @@ public: bool loadKeymap(const QString &file); void unloadKeymap(); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch index 0cbfbb9d5..83398f104 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch @@ -10,7 +10,7 @@ Genode-specific adaptations qtbase/src/corelib/global/qversiontagging.cpp | 2 - qtbase/src/corelib/io/qresource.cpp | 2 - qtbase/src/corelib/kernel/qcoreapplication.cpp | 2 - - .../src/corelib/kernel/qeventdispatcher_unix.cpp | 14 +++++ + .../src/corelib/kernel/qeventdispatcher_unix.cpp | 7 +++ qtbase/src/corelib/kernel/qtranslator.cpp | 2 - qtbase/src/corelib/thread/qthread.cpp | 4 + qtbase/src/corelib/thread/qthread_p.h | 55 ++++++++++++++++++++ @@ -21,13 +21,13 @@ Genode-specific adaptations qtbase/src/network/kernel/qhostinfo_unix.cpp | 7 ++- qtbase/src/widgets/dialogs/qfiledialog.cpp | 2 - qtbase/src/widgets/styles/qstylefactory.cpp | 7 +++ - 17 files changed, 123 insertions(+), 8 deletions(-) + 17 files changed, 116 insertions(+), 8 deletions(-) diff --git a/qtbase/src/corelib/codecs/qtextcodec.cpp b/qtbase/src/corelib/codecs/qtextcodec.cpp -index c55f93b..9d69f16 100644 +index edb03af..1008447 100644 --- a/qtbase/src/corelib/codecs/qtextcodec.cpp +++ b/qtbase/src/corelib/codecs/qtextcodec.cpp -@@ -198,7 +198,11 @@ static QTextCodec *setupLocaleMapper() +@@ -204,7 +204,11 @@ static QTextCodec *setupLocaleMapper() // First part is getting that locale name. First try setlocale() which // definitely knows it, but since we cannot fully trust it, get ready // to fall back to environment variables. @@ -40,10 +40,10 @@ index c55f93b..9d69f16 100644 // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG // environment variables. diff --git a/qtbase/src/corelib/global/qcompilerdetection.h b/qtbase/src/corelib/global/qcompilerdetection.h -index 2d9e046..aac1d7b 100644 +index d0eb2af..66364fd 100644 --- a/qtbase/src/corelib/global/qcompilerdetection.h +++ b/qtbase/src/corelib/global/qcompilerdetection.h -@@ -826,7 +826,9 @@ +@@ -889,7 +889,9 @@ # define Q_COMPILER_ALIGNAS # define Q_COMPILER_ALIGNOF # define Q_COMPILER_INHERITING_CONSTRUCTORS @@ -55,18 +55,18 @@ index 2d9e046..aac1d7b 100644 # define Q_COMPILER_REF_QUALIFIERS # endif diff --git a/qtbase/src/corelib/global/qsystemdetection.h b/qtbase/src/corelib/global/qsystemdetection.h -index de95ae3..7b6aaa6 100644 +index 1e852ae..99394de 100644 --- a/qtbase/src/corelib/global/qsystemdetection.h +++ b/qtbase/src/corelib/global/qsystemdetection.h -@@ -41,6 +41,7 @@ +@@ -47,6 +47,7 @@ /* The operating system, must be one of: (Q_OS_x) + GENODE - Genode - DARWIN - Any Darwin system + DARWIN - Any Darwin system (OS X, iOS, watchOS, tvOS) MACOS - macOS IOS - iOS -@@ -86,7 +87,9 @@ +@@ -92,7 +93,9 @@ - Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU */ @@ -74,14 +74,14 @@ index de95ae3..7b6aaa6 100644 +#if defined(__GENODE__) +# define Q_OS_GENODE +#elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) - # define Q_OS_DARWIN - # define Q_OS_BSD4 - # ifdef __LP64__ + # include + # if defined(TARGET_OS_MAC) && TARGET_OS_MAC + # define Q_OS_DARWIN diff --git a/qtbase/src/corelib/global/qversiontagging.cpp b/qtbase/src/corelib/global/qversiontagging.cpp -index e7524f3..e31f8b3 100644 +index e3d4037..7e57df5 100644 --- a/qtbase/src/corelib/global/qversiontagging.cpp +++ b/qtbase/src/corelib/global/qversiontagging.cpp -@@ -36,7 +36,7 @@ +@@ -42,7 +42,7 @@ #define SYM QT_MANGLE_NAMESPACE(qt_version_tag) //#define SSYM QT_STRINGIFY(SYM) @@ -91,10 +91,10 @@ index e7524f3..e31f8b3 100644 Q_CORE_EXPORT extern const char sym ## _ ## m ## _ ## n = 0; \ asm(".symver " QT_STRINGIFY(sym) "_" QT_STRINGIFY(m) "_" QT_STRINGIFY(n) ", " \ diff --git a/qtbase/src/corelib/io/qresource.cpp b/qtbase/src/corelib/io/qresource.cpp -index c584933..615a7d5 100644 +index 96957ac..ff82f21 100644 --- a/qtbase/src/corelib/io/qresource.cpp +++ b/qtbase/src/corelib/io/qresource.cpp -@@ -922,7 +922,7 @@ public: +@@ -928,7 +928,7 @@ public: } }; @@ -104,23 +104,23 @@ index c584933..615a7d5 100644 #endif diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp -index f5b1520..5ae76c5 100644 +index 2179a0d..71617cc 100644 --- a/qtbase/src/corelib/kernel/qcoreapplication.cpp +++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -602,7 +602,7 @@ void QCoreApplicationPrivate::initLocale() +@@ -575,7 +575,7 @@ void QCoreApplicationPrivate::initLocale() if (qt_locale_initialized) return; qt_locale_initialized = true; --#ifdef Q_OS_UNIX -+#if defined(Q_OS_UNIX) && !defined(Q_OS_GENODE) +-#if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) ++#if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) && !defined(Q_OS_GENODE) setlocale(LC_ALL, ""); #endif } diff --git a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -index 155f7b7..2e32ddb 100644 +index 802962d..be1803c 100644 --- a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -66,6 +66,11 @@ +@@ -73,6 +73,11 @@ # include #endif @@ -131,35 +131,21 @@ index 155f7b7..2e32ddb 100644 + QT_BEGIN_NAMESPACE - #if defined(Q_OS_INTEGRITY) || defined(Q_OS_VXWORKS) -@@ -279,6 +284,9 @@ int QEventDispatcherUNIXPrivate::processThreadWakeUp(int nsel) - char c[16]; - ::read(thread_pipe[0], c, sizeof(c)); - ::ioctl(thread_pipe[0], FIOFLUSH, 0); + static const char *socketType(QSocketNotifier::Type type) +@@ -200,6 +205,8 @@ int QThreadPipe::check(const pollfd &pfd) + #if defined(Q_OS_VXWORKS) + ::read(fds[0], c, sizeof(c)); + ::ioctl(fds[0], FIOFLUSH, 0); +#elif defined(Q_OS_GENODE) -+ char c[16]; -+ ::read(thread_pipe[0], c, sizeof(c)); // FIXME: the while loop only works in non-blocking mode ++ ::read(fds[0], c, sizeof(c)); // FIXME: the while loop only works in non-blocking mode #else # ifndef QT_NO_EVENTFD - if (thread_pipe[1] == -1) { -@@ -317,6 +325,12 @@ QEventDispatcherUNIX::~QEventDispatcherUNIX() - int QEventDispatcherUNIX::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - timespec *timeout) - { -+#ifdef Q_OS_GENODE -+ /* if < 10ms round up to the 10ms minimum granularity supported by -+ * the timed semaphore */ -+ if (timeout && (timeout->tv_sec == 0) && (timeout->tv_nsec > 0) && (timeout->tv_nsec < 10*1000*1000)) -+ timeout->tv_nsec = 10*1000*1000; -+#endif /* Q_OS_GENODE */ - return qt_safe_select(nfds, readfds, writefds, exceptfds, timeout); - } - + if (fds[1] == -1) { diff --git a/qtbase/src/corelib/kernel/qtranslator.cpp b/qtbase/src/corelib/kernel/qtranslator.cpp -index 794a4aa..953d63c 100644 +index 2c813b5..3fb323e 100644 --- a/qtbase/src/corelib/kernel/qtranslator.cpp +++ b/qtbase/src/corelib/kernel/qtranslator.cpp -@@ -51,7 +51,7 @@ +@@ -57,7 +57,7 @@ #include "qendian.h" #include "qresource.h" @@ -169,10 +155,10 @@ index 794a4aa..953d63c 100644 #include "private/qcore_unix_p.h" #endif diff --git a/qtbase/src/corelib/thread/qthread.cpp b/qtbase/src/corelib/thread/qthread.cpp -index 8ea487e..2a8ee31 100644 +index 4aac24f..76ba470 100644 --- a/qtbase/src/corelib/thread/qthread.cpp +++ b/qtbase/src/corelib/thread/qthread.cpp -@@ -142,6 +142,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) +@@ -149,6 +149,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) exited(false), returnCode(-1), stackSize(0), priority(QThread::InheritPriority), data(d) { @@ -184,10 +170,10 @@ index 8ea487e..2a8ee31 100644 handle = 0; # ifndef Q_OS_WINRT diff --git a/qtbase/src/corelib/thread/qthread_p.h b/qtbase/src/corelib/thread/qthread_p.h -index a56b879..c23862b 100644 +index 37eca9c..a55b27d 100644 --- a/qtbase/src/corelib/thread/qthread_p.h +++ b/qtbase/src/corelib/thread/qthread_p.h -@@ -46,6 +46,10 @@ +@@ -53,6 +53,10 @@ // // @@ -198,7 +184,7 @@ index a56b879..c23862b 100644 #include "qplatformdefs.h" #include "QtCore/qthread.h" #include "QtCore/qmutex.h" -@@ -169,11 +173,62 @@ public: +@@ -176,11 +180,62 @@ public: static QThread *threadForId(int id); #ifdef Q_OS_UNIX @@ -262,10 +248,10 @@ index a56b879..c23862b 100644 #ifdef Q_OS_WIN diff --git a/qtbase/src/corelib/tools/qdatetime.cpp b/qtbase/src/corelib/tools/qdatetime.cpp -index e6d0b97..da15640 100644 +index bfc7e1c..eac18c9 100644 --- a/qtbase/src/corelib/tools/qdatetime.cpp +++ b/qtbase/src/corelib/tools/qdatetime.cpp -@@ -2145,6 +2145,9 @@ static int qt_timezone() +@@ -2170,6 +2170,9 @@ static int qt_timezone() long offset; _get_timezone(&offset); return offset; @@ -276,10 +262,10 @@ index e6d0b97..da15640 100644 time_t clock = time(NULL); struct tm t; diff --git a/qtbase/src/gui/image/qxpmhandler.cpp b/qtbase/src/gui/image/qxpmhandler.cpp -index b673ae5..6df45c3 100644 +index c8c8f99..714016a 100644 --- a/qtbase/src/gui/image/qxpmhandler.cpp +++ b/qtbase/src/gui/image/qxpmhandler.cpp -@@ -842,8 +842,16 @@ static bool read_xpm_header( +@@ -848,8 +848,16 @@ static bool read_xpm_header( #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) #else @@ -297,10 +283,10 @@ index b673ae5..6df45c3 100644 return true; diff --git a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -index bb97bae..38de88b 100644 +index 6043943..291df77 100644 --- a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp +++ b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -@@ -118,6 +118,7 @@ void QNetworkAccessFileBackend::open() +@@ -124,6 +124,7 @@ void QNetworkAccessFileBackend::open() url.setPath(QLatin1String("/")); setUrl(url); @@ -308,7 +294,7 @@ index bb97bae..38de88b 100644 QString fileName = url.toLocalFile(); if (fileName.isEmpty()) { if (url.scheme() == QLatin1String("qrc")) { -@@ -131,6 +132,10 @@ void QNetworkAccessFileBackend::open() +@@ -137,6 +138,10 @@ void QNetworkAccessFileBackend::open() fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery); } } @@ -320,10 +306,10 @@ index bb97bae..38de88b 100644 if (operation() == QNetworkAccessManager::GetOperation) { diff --git a/qtbase/src/network/kernel/qhostinfo.cpp b/qtbase/src/network/kernel/qhostinfo.cpp -index c6c0954..934ebc3 100644 +index 88df65d..cbaca0b 100644 --- a/qtbase/src/network/kernel/qhostinfo.cpp +++ b/qtbase/src/network/kernel/qhostinfo.cpp -@@ -512,7 +512,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was +@@ -556,7 +556,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was { moveToThread(QCoreApplicationPrivate::mainThread()); connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection); @@ -337,10 +323,10 @@ index c6c0954..934ebc3 100644 QHostInfoLookupManager::~QHostInfoLookupManager() diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp -index dabf191..ce3da10 100644 +index 7af8db7..1f40ad1 100644 --- a/qtbase/src/network/kernel/qhostinfo_unix.cpp +++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -142,6 +142,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) +@@ -148,6 +148,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) QHostAddress address; if (address.setAddress(hostName)) { // Reverse lookup @@ -352,7 +338,7 @@ index dabf191..ce3da10 100644 // Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead. #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) sockaddr_in sa4; -@@ -172,7 +177,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) +@@ -178,7 +183,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) if (ent) results.setHostName(QString::fromLatin1(ent->h_name)); #endif @@ -362,26 +348,26 @@ index dabf191..ce3da10 100644 results.setHostName(address.toString()); results.setAddresses(QList() << address); diff --git a/qtbase/src/widgets/dialogs/qfiledialog.cpp b/qtbase/src/widgets/dialogs/qfiledialog.cpp -index bc2de89..ce3a97e 100644 +index fc360d8..6b0fd42 100644 --- a/qtbase/src/widgets/dialogs/qfiledialog.cpp +++ b/qtbase/src/widgets/dialogs/qfiledialog.cpp -@@ -1106,7 +1106,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded - userName.remove(0, 1); - #if defined(Q_OS_VXWORKS) +@@ -1111,7 +1111,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) const QString homePath = QDir::homePath(); --#elif defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) -+#elif defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_GENODE) + #else + const QByteArray userName = path.midRef(1, separatorPosition - 1).toLocal8Bit(); +-# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) ++# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_GENODE) passwd pw; passwd *tmpPw; char buf[200]; diff --git a/qtbase/src/widgets/styles/qstylefactory.cpp b/qtbase/src/widgets/styles/qstylefactory.cpp -index 520e303..8226dd2 100644 +index bebd322..d0e2ebb 100644 --- a/qtbase/src/widgets/styles/qstylefactory.cpp +++ b/qtbase/src/widgets/styles/qstylefactory.cpp -@@ -184,6 +184,13 @@ QStringList QStyleFactory::keys() +@@ -176,6 +176,13 @@ QStringList QStyleFactory::keys() + const PluginKeyMap::const_iterator cend = keyMap.constEnd(); for (PluginKeyMap::const_iterator it = keyMap.constBegin(); it != cend; ++it) list.append(it.value()); - #endif +#ifdef Q_OS_GENODE +/* on Genode, the first style in the list gets selected by default and we want the "Fusion" style */ +#ifndef QT_NO_STYLE_FUSION diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch index 3185bd96a..f922a9ae5 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 16 insertions(+) diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -index 1ce12ed..db45dc0 100644 +index 2d50cc1..7825be5 100644 --- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp +++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -@@ -402,6 +402,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 +@@ -389,6 +389,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 case EISCONN: socketState = QAbstractSocket::ConnectedState; break; diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch index e371fb2a5..a52ed34b0 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch @@ -5,16 +5,16 @@ From: Christian Prochaska --- qtbase/src/corelib/global/qconfig.cpp | 59 +++++++ - qtbase/src/corelib/global/qconfig.h | 165 +++++++++++++++++++++ + qtbase/src/corelib/global/qconfig.h | 147 ++++++++++++++++++ qtbase/src/corelib/global/qfeatures.h | 263 +++++++++++++++++++++++++++++++++ - 3 files changed, 487 insertions(+) + 3 files changed, 469 insertions(+) create mode 100644 qtbase/src/corelib/global/qconfig.cpp create mode 100644 qtbase/src/corelib/global/qconfig.h create mode 100644 qtbase/src/corelib/global/qfeatures.h diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp new file mode 100644 -index 0000000..5438a45 +index 0000000..0c319a6 --- /dev/null +++ b/qtbase/src/corelib/global/qconfig.cpp @@ -0,0 +1,59 @@ @@ -23,7 +23,7 @@ index 0000000..5438a45 +static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=OpenSource"; + +/* Installation date */ -+static const char qt_configure_installation [12+11] = "qt_instdate=2017-03-28"; ++static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; + +/* Installation Info */ +static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=/qt"; @@ -79,14 +79,14 @@ index 0000000..5438a45 +#endif diff --git a/qtbase/src/corelib/global/qconfig.h b/qtbase/src/corelib/global/qconfig.h new file mode 100644 -index 0000000..27629e5 +index 0000000..57d990f --- /dev/null +++ b/qtbase/src/corelib/global/qconfig.h -@@ -0,0 +1,165 @@ +@@ -0,0 +1,147 @@ +#define QT_VERSION_MAJOR 5 -+#define QT_VERSION_MINOR 6 -+#define QT_VERSION_PATCH 2 -+#define QT_VERSION_STR "5.6.2" ++#define QT_VERSION_MINOR 7 ++#define QT_VERSION_PATCH 1 ++#define QT_VERSION_STR "5.7.1" + +#ifndef QT_BOOTSTRAPPED +#include "qconfig-genode.h" @@ -178,12 +178,6 @@ index 0000000..27629e5 +# define QT_NO_PULSEAUDIO +#endif + -+#if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK) -+# undef QT_NO_STYLE_GTK -+#elif !defined(QT_NO_STYLE_GTK) && !defined(QT_STYLE_GTK) -+# define QT_NO_STYLE_GTK -+#endif -+ +#if defined(QT_NO_TSLIB) && defined(QT_TSLIB) +# undef QT_NO_TSLIB +#elif !defined(QT_NO_TSLIB) && !defined(QT_TSLIB) @@ -208,18 +202,6 @@ index 0000000..27629e5 +# define QT_RUNTIME_XFIXES +#endif + -+#if defined(QT_RUNTIME_XINERAMA) && defined(QT_NO_RUNTIME_XINERAMA) -+# undef QT_RUNTIME_XINERAMA -+#elif !defined(QT_RUNTIME_XINERAMA) && !defined(QT_NO_RUNTIME_XINERAMA) -+# define QT_RUNTIME_XINERAMA -+#endif -+ -+#if defined(QT_RUNTIME_XINPUT) && defined(QT_NO_RUNTIME_XINPUT) -+# undef QT_RUNTIME_XINPUT -+#elif !defined(QT_RUNTIME_XINPUT) && !defined(QT_NO_RUNTIME_XINPUT) -+# define QT_RUNTIME_XINPUT -+#endif -+ +#if defined(QT_RUNTIME_XRANDR) && defined(QT_NO_RUNTIME_XRANDR) +# undef QT_RUNTIME_XRANDR +#elif !defined(QT_RUNTIME_XRANDR) && !defined(QT_NO_RUNTIME_XRANDR) diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch index ded41b866..49cd7fd9e 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase/src/corelib/kernel/qobject.h b/qtbase/src/corelib/kernel/qobject.h -index b39eefa..7932c8d 100644 +index c06f702..2cbb61b 100644 --- a/qtbase/src/corelib/kernel/qobject.h +++ b/qtbase/src/corelib/kernel/qobject.h -@@ -422,7 +422,7 @@ public: +@@ -397,7 +397,7 @@ public: { return const_cast(this)->qt_metacast(classname) != Q_NULLPTR; } public Q_SLOTS: diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch b/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch index 67df37e4d..414229f62 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch @@ -4,17 +4,19 @@ From: Christian Prochaska --- - qtbase/src/network/access/qhttpnetworkreply.cpp | 8 ++++++++ - qtbase/src/network/socket/qnet_unix_p.h | 10 ++++++++++ - qtbase/src/network/ssl/qsslconfiguration_p.h | 9 +++++++++ - qtbase/src/network/ssl/qsslsocket_openssl.cpp | 3 +++ - 4 files changed, 30 insertions(+) + qtbase/src/network/access/qhttpnetworkreply.cpp | 8 ++++++++ + qtbase/src/network/socket/qnativesocketengine_p.h | 4 ++++ + .../network/socket/qnativesocketengine_unix.cpp | 2 ++ + qtbase/src/network/socket/qnet_unix_p.h | 10 ++++++++++ + qtbase/src/network/ssl/qsslconfiguration_p.h | 9 +++++++++ + qtbase/src/network/ssl/qsslsocket_openssl.cpp | 3 +++ + 6 files changed, 36 insertions(+) diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp -index f1b0a84..eae866e 100644 +index 3601c36..00b1632 100644 --- a/qtbase/src/network/access/qhttpnetworkreply.cpp +++ b/qtbase/src/network/access/qhttpnetworkreply.cpp -@@ -247,8 +247,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size) +@@ -251,8 +251,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size) bool QHttpNetworkReply::supportsUserProvidedDownloadBuffer() { @@ -31,11 +33,51 @@ index f1b0a84..eae866e 100644 } void QHttpNetworkReply::setUserProvidedDownloadBuffer(char* b) +diff --git a/qtbase/src/network/socket/qnativesocketengine_p.h b/qtbase/src/network/socket/qnativesocketengine_p.h +index 19e9e1d..b972ff0 100644 +--- a/qtbase/src/network/socket/qnativesocketengine_p.h ++++ b/qtbase/src/network/socket/qnativesocketengine_p.h +@@ -286,8 +286,10 @@ public: + bool checkProxy(const QHostAddress &address); + bool fetchConnectionParameters(); + ++#ifndef QT_NO_NETWORKINTERFACE + static uint scopeIdFromString(const QString &scopeid) + { return QNetworkInterface::interfaceIndexFromName(scopeid); } ++#endif + + /*! \internal + Sets \a address and \a port in the \a aa sockaddr structure and the size in \a sockAddrSize. +@@ -301,7 +303,9 @@ public: + || socketProtocol == QAbstractSocket::AnyIPProtocol) { + memset(&aa->a6, 0, sizeof(sockaddr_in6)); + aa->a6.sin6_family = AF_INET6; ++#ifndef QT_NO_NETWORKINTERFACE + aa->a6.sin6_scope_id = scopeIdFromString(address.scopeId()); ++#endif + aa->a6.sin6_port = htons(port); + Q_IPV6ADDR tmp = address.toIPv6Address(); + memcpy(&aa->a6.sin6_addr, &tmp, sizeof(tmp)); +diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp +index 7825be5..3270415 100644 +--- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp ++++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp +@@ -116,8 +116,10 @@ static inline void qt_socket_getPortAndAddress(const qt_sockaddr *s, quint16 *po + QHostAddress tmpAddress; + tmpAddress.setAddress(tmp); + *addr = tmpAddress; ++#ifndef QT_NO_NETWORKINTERFACE + if (s->a6.sin6_scope_id) + addr->setScopeId(QNetworkInterface::interfaceNameFromIndex(s->a6.sin6_scope_id)); ++#endif + } + if (port) + *port = ntohs(s->a6.sin6_port); diff --git a/qtbase/src/network/socket/qnet_unix_p.h b/qtbase/src/network/socket/qnet_unix_p.h -index 1481f56..63ca9a8 100644 +index 8d2a4ae..c73f2db 100644 --- a/qtbase/src/network/socket/qnet_unix_p.h +++ b/qtbase/src/network/socket/qnet_unix_p.h -@@ -179,6 +179,10 @@ static inline in_addr_t qt_safe_inet_addr(const char *cp) +@@ -185,6 +185,10 @@ static inline in_addr_t qt_safe_inet_addr(const char *cp) static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags) { @@ -46,7 +88,7 @@ index 1481f56..63ca9a8 100644 #ifdef MSG_NOSIGNAL flags |= MSG_NOSIGNAL; #else -@@ -188,14 +192,20 @@ static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flag +@@ -194,14 +198,20 @@ static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flag int ret; EINTR_LOOP(ret, ::sendmsg(sockfd, msg, flags)); return ret; @@ -68,10 +110,10 @@ index 1481f56..63ca9a8 100644 QT_END_NAMESPACE diff --git a/qtbase/src/network/ssl/qsslconfiguration_p.h b/qtbase/src/network/ssl/qsslconfiguration_p.h -index 3fd1252..56251ca 100644 +index 364bba9..b45a8cc 100644 --- a/qtbase/src/network/ssl/qsslconfiguration_p.h +++ b/qtbase/src/network/ssl/qsslconfiguration_p.h -@@ -76,7 +76,16 @@ public: +@@ -82,7 +82,16 @@ public: QSslConfigurationPrivate() : sessionProtocol(QSsl::UnknownProtocol), protocol(QSsl::SecureProtocols), @@ -89,10 +131,10 @@ index 3fd1252..56251ca 100644 allowRootCertOnDemandLoading(true), peerSessionShared(false), diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -index 82644c1..1701cf4 100644 +index b3820ae..141f57b 100644 --- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp +++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -481,7 +481,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded() +@@ -491,7 +491,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded() if (q_SSL_library_init() != 1) return false; q_SSL_load_error_strings(); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch b/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch index 5266a549b..db14f62c1 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch @@ -12,10 +12,10 @@ From: Christian Prochaska 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h -index a7183cb..457ba65 100644 +index 118203f..79fb45e 100644 --- a/qtbase/src/corelib/global/qglobal.h +++ b/qtbase/src/corelib/global/qglobal.h -@@ -864,13 +864,17 @@ inline void qSwap(T &value1, T &value2) +@@ -886,13 +886,17 @@ inline void qSwap(T &value1, T &value2) swap(value1, value2); } @@ -35,10 +35,10 @@ index a7183cb..457ba65 100644 Q_CORE_EXPORT void *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment) Q_ALLOC_SIZE(2); Q_CORE_EXPORT void qFreeAligned(void *ptr); diff --git a/qtbase/src/corelib/kernel/qvariant_p.h b/qtbase/src/corelib/kernel/qvariant_p.h -index 337e140..11f73ab 100644 +index d01f386..2b09fab 100644 --- a/qtbase/src/corelib/kernel/qvariant_p.h +++ b/qtbase/src/corelib/kernel/qvariant_p.h -@@ -383,7 +383,10 @@ public: +@@ -350,7 +350,10 @@ public: void delegate(const void*) { diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch index a2e89df4f..f8a0ca797 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch @@ -10,7 +10,7 @@ From: Christian Prochaska 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf -index 49f8495..aa33732 100644 +index b5fb2ae..40e9aec 100644 --- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf +++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf @@ -49,7 +49,6 @@ defineTest(runConfigure) { diff --git a/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch b/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch index 58302e899..63dbfd7e3 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qtbase/src/widgets/widgets/qwidgetanimator.cpp b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -index a6aaddd..6c8cb4b 100644 +index d46d655..5ef6967 100644 --- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp +++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -@@ -67,7 +67,8 @@ void QWidgetAnimator::abort(QWidget *w) +@@ -73,7 +73,8 @@ void QWidgetAnimator::abort(QWidget *w) void QWidgetAnimator::animationFinished() { QPropertyAnimation *anim = qobject_cast(sender()); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch b/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch index 09bff5941..0327ac886 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 3 insertions(+) diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -index 872572a..ea6314d 100644 +index f3fbe13..c990b33 100644 --- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp +++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -@@ -318,6 +318,9 @@ bool QWidgetWindow::event(QEvent *event) +@@ -324,6 +324,9 @@ bool QWidgetWindow::event(QEvent *event) m_widget->repaint(); return true; diff --git a/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch b/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch index c85d80db2..5a0142aba 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch @@ -9,10 +9,10 @@ From: Christian Prochaska 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/qtbase/examples/widgets/richtext/textedit/main.cpp b/qtbase/examples/widgets/richtext/textedit/main.cpp -index 1de6d99..b802866 100644 +index aef186a..246f517 100644 --- a/qtbase/examples/widgets/richtext/textedit/main.cpp +++ b/qtbase/examples/widgets/richtext/textedit/main.cpp -@@ -31,6 +31,10 @@ +@@ -48,6 +48,10 @@ ** ****************************************************************************/ @@ -23,7 +23,7 @@ index 1de6d99..b802866 100644 #include "textedit.h" #include -@@ -42,6 +46,16 @@ int main(int argc, char *argv[]) +@@ -59,6 +63,16 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(textedit); @@ -40,7 +40,7 @@ index 1de6d99..b802866 100644 QApplication a(argc, argv); QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationName("Rich Text"); -@@ -55,10 +69,8 @@ int main(int argc, char *argv[]) +@@ -72,10 +86,8 @@ int main(int argc, char *argv[]) TextEdit mw; diff --git a/repos/libports/src/lib/qt5/patches/qt5_tools.patch b/repos/libports/src/lib/qt5/patches/qt5_tools.patch index d2fd5cb2e..f1c2c197f 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_tools.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_tools.patch @@ -5,15 +5,15 @@ From: Christian Prochaska Support out-of-tree build of Qt host tools. This patch should not be applied when running the Qt 'configure' script. --- - qtbase/mkspecs/features/qt.prf | 2 - - qtbase/mkspecs/features/qt_build_config.prf | 2 - - qtbase/mkspecs/features/qt_module.prf | 4 + - qtbase/mkspecs/features/qt_tool.prf | 94 ++++++++++++++------------- - qtbase/qmake/Makefile.unix | 2 - - 5 files changed, 52 insertions(+), 52 deletions(-) + qtbase/mkspecs/features/qt.prf | 2 + qtbase/mkspecs/features/qt_build_config.prf | 2 + qtbase/mkspecs/features/qt_module.prf | 4 - + qtbase/mkspecs/features/qt_tool.prf | 112 ++++++++++++++------------- + qtbase/qmake/Makefile.unix | 2 + 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf -index be08a2a..ea41489 100644 +index bb52f23..78fc527 100644 --- a/qtbase/mkspecs/features/qt.prf +++ b/qtbase/mkspecs/features/qt.prf @@ -151,7 +151,7 @@ for(ever) { @@ -39,7 +39,7 @@ index 1e2d5c2..4f7e611 100644 debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") } diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf -index 22e2dd5..7141d22 100644 +index d9011f5..51c0900 100644 --- a/qtbase/mkspecs/features/qt_module.prf +++ b/qtbase/mkspecs/features/qt_module.prf @@ -21,7 +21,7 @@ load(qt_build_config) # loads qmodule.pri if hasn't been loaded already @@ -61,43 +61,52 @@ index 22e2dd5..7141d22 100644 INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.includes) diff --git a/qtbase/mkspecs/features/qt_tool.prf b/qtbase/mkspecs/features/qt_tool.prf -index 839c3d6..6d88db7 100644 +index bdeb59c..bdf4b5f 100644 --- a/qtbase/mkspecs/features/qt_tool.prf +++ b/qtbase/mkspecs/features/qt_tool.prf -@@ -17,52 +17,52 @@ DEFINES *= QT_USE_QSTRINGBUILDER +@@ -17,61 +17,61 @@ DEFINES *= QT_USE_QSTRINGBUILDER # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. # Non-bootstrapped tools always need this because of the environment setup. --!build_pass:if(!host_build|!force_bootstrap|force_independent) { +-!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) { - isEmpty(MODULE):MODULE = $$TARGET - -- !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) -- - load(qt_build_paths) - -- load(resolve_target) -- - TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri - - vars = binary depends -- !isEmpty(QT_TOOL_ENV) { -- vars += envvars -- module_var_names = -- module_var_sets = -- for(var, QT_TOOL_ENV) { -- vars += env.$${var}.name env.$${var}.value -- module_var_names += QT_TOOL.$${MODULE}.env.$${var} -- module_var_sets += \ -- "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ -- "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" +- +- isEmpty(HOST_QT_TOOLS) { +- load(resolve_target) +- +- !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) +- +- !isEmpty(QT_TOOL_ENV) { +- vars += envvars +- module_var_names = +- module_var_sets = +- for(var, QT_TOOL_ENV) { +- vars += env.$${var}.name env.$${var}.value +- module_var_names += QT_TOOL.$${MODULE}.env.$${var} +- module_var_sets += \ +- "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ +- "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" +- } +- module_envvars = \ +- "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ +- $$module_var_sets +- } else { +- module_envvars = - } -- module_envvars = \ -- "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ -- $$module_var_sets +- +- bin = $$system_path($$QMAKE_RESOLVED_TARGET) - } else { -- module_envvars = +- bin = $${HOST_QT_TOOLS}/$${TARGET} +- equals(QMAKE_HOST.os, Windows): bin = $${bin}.exe +- bin = $$system_path($$bin) - } -- bin = $$system_path($$QMAKE_RESOLVED_TARGET) +- - TOOL_PRI_CONT = \ - "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ - "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ @@ -115,36 +124,45 @@ index 839c3d6..6d88db7 100644 - cache(QT_TOOL.$${MODULE}.$$var, transient) - -} -+#!build_pass:if(!host_build|!force_bootstrap|force_independent) { ++#!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) { +# isEmpty(MODULE):MODULE = $$TARGET +# -+# !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) -+# +# load(qt_build_paths) +# -+# load(resolve_target) -+# +# TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri +# +# vars = binary depends -+# !isEmpty(QT_TOOL_ENV) { -+# vars += envvars -+# module_var_names = -+# module_var_sets = -+# for(var, QT_TOOL_ENV) { -+# vars += env.$${var}.name env.$${var}.value -+# module_var_names += QT_TOOL.$${MODULE}.env.$${var} -+# module_var_sets += \ -+# "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ -+# "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" ++# ++# isEmpty(HOST_QT_TOOLS) { ++# load(resolve_target) ++# ++# !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) ++# ++# !isEmpty(QT_TOOL_ENV) { ++# vars += envvars ++# module_var_names = ++# module_var_sets = ++# for(var, QT_TOOL_ENV) { ++# vars += env.$${var}.name env.$${var}.value ++# module_var_names += QT_TOOL.$${MODULE}.env.$${var} ++# module_var_sets += \ ++# "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ ++# "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" ++# } ++# module_envvars = \ ++# "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ ++# $$module_var_sets ++# } else { ++# module_envvars = +# } -+# module_envvars = \ -+# "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ -+# $$module_var_sets ++# ++# bin = $$system_path($$QMAKE_RESOLVED_TARGET) +# } else { -+# module_envvars = ++# bin = $${HOST_QT_TOOLS}/$${TARGET} ++# equals(QMAKE_HOST.os, Windows): bin = $${bin}.exe ++# bin = $$system_path($$bin) +# } -+# bin = $$system_path($$QMAKE_RESOLVED_TARGET) ++# +# TOOL_PRI_CONT = \ +# "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ +# "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ @@ -165,10 +183,10 @@ index 839c3d6..6d88db7 100644 # The variable is re-used by qtPrepareTool(), and we really don't want that. unset(QT_TOOL_ENV) diff --git a/qtbase/qmake/Makefile.unix b/qtbase/qmake/Makefile.unix -index 405bbf9..cf5fa02 100644 +index 9d3ddab..a5875a5 100644 --- a/qtbase/qmake/Makefile.unix +++ b/qtbase/qmake/Makefile.unix -@@ -229,7 +229,7 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp +@@ -230,7 +230,7 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp diff --git a/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch b/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch new file mode 100644 index 000000000..fd4cf116d --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch @@ -0,0 +1,44 @@ +qtscriptclassic_qt5_7.patch + +From: Christian Prochaska + + +--- + src/qscriptengine_p.cpp | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/qscriptengine_p.cpp b/src/qscriptengine_p.cpp +index 4e9076d..65ffcf0 100644 +--- a/src/qscriptengine_p.cpp ++++ b/src/qscriptengine_p.cpp +@@ -91,7 +91,7 @@ Q_DECLARE_METATYPE(QList) + + QT_BEGIN_NAMESPACE + +-extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **digits_str); ++extern QString qdtoa(qreal d, int *decpt, int *sign); + extern double qstrtod(const char *s00, char const **se, bool *ok); + + namespace QScript { +@@ -112,10 +112,9 @@ QString numberToString(qsreal value) + + int decpt; + int sign; +- char *result = 0; +- (void) qdtoa(value, 0, 0, &decpt, &sign, 0, &result); ++ QString result = qdtoa(value, &decpt, &sign); + +- if (! result) ++ if (result.isEmpty()) + return QString(); + + else if (decpt <= 0 && decpt > -6) { +@@ -165,8 +164,6 @@ QString numberToString(qsreal value) + } + } + +- free(result); +- + return QString::fromLatin1(buf); + } + diff --git a/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp b/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp index 6b21478fa..a63458104 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp @@ -1,31 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 Intel Corporation. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -38,18 +45,16 @@ #include #include -#if defined(Q_OS_BLACKBERRY) -# include -#elif defined(Q_OS_OSX) +#if defined(Q_OS_OSX) # include -# include #else # if !defined(QT_NO_GLIB) # include "../kernel/qeventdispatcher_glib_p.h" # endif -# include #endif +#include + #include "qthreadstorage.h" #include "qthread_p.h" @@ -313,9 +318,7 @@ typedef void*(*QtThreadCallback)(void*); void QThreadPrivate::createEventDispatcher(QThreadData *data) { -#if defined(Q_OS_BLACKBERRY) - data->eventDispatcher.storeRelease(new QEventDispatcherBlackberry); -# elif defined(Q_OS_OSX) +#if defined(Q_OS_OSX) bool ok = false; int value = qEnvironmentVariableIntValue("QT_EVENT_DISPATCHER_CORE_FOUNDATION", &ok); if (ok && value > 0) diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp index 204243a1a..5f790d487 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp @@ -124,13 +124,13 @@ void QNitpickerGLContext::swapBuffers(QPlatformSurface *surface) } -void (*QNitpickerGLContext::getProcAddress(const QByteArray &procName)) () +QFunctionPointer QNitpickerGLContext::getProcAddress(const char *procName) { if (qnglc_verbose) - Genode::log("procName=", procName.constData(), " , " - "pointer=", eglGetProcAddress(procName.constData())); + Genode::log("procName=", Genode::Cstring(procName), " , " + "pointer=", eglGetProcAddress(procName)); - return static_cast(eglGetProcAddress(procName.constData())); + return static_cast(eglGetProcAddress(procName)); } diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h index 8187f3613..076974714 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h @@ -38,15 +38,15 @@ class QNitpickerGLContext : public QPlatformOpenGLContext QNitpickerGLContext(QOpenGLContext *context); - QSurfaceFormat format() const; + QSurfaceFormat format() const Q_DECL_OVERRIDE; - void swapBuffers(QPlatformSurface *surface); + void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; - bool makeCurrent(QPlatformSurface *surface); + bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent(); + void doneCurrent() Q_DECL_OVERRIDE; - void (*getProcAddress(const QByteArray &procName)) (); + QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; }; QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp index 64f59e7fb..88794aba4 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp @@ -338,7 +338,7 @@ QNitpickerPlatformWindow::QNitpickerPlatformWindow(Genode::Env &env, QWindow *wi _view_handle(_create_view()), _input_session(env.rm(), _nitpicker_session.input_session()), _ev_buf(env.rm(), _input_session.dataspace()), - _keyboard_handler("", -1, false, false, ""), + _keyboard_handler("", _evdevkeyboard_fd, false, false, ""), _resize_handle(!window->flags().testFlag(Qt::Popup)), _decoration(!window->flags().testFlag(Qt::Popup)), _egl_surface(EGL_NO_SURFACE), diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h index a4df72e1d..1537cb7c7 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h @@ -56,6 +56,7 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow Input::Session_client _input_session; Genode::Attached_dataspace _ev_buf; Qt::MouseButtons _mouse_button_state; + QFdContainer _evdevkeyboard_fd { -1 }; QEvdevKeyboardHandler _keyboard_handler; QByteArray _title; bool _resize_handle; diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs index 769cb0bb6..f7e9a2036 100755 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs +++ b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs @@ -1,6 +1,6 @@ #!/bin/sh -QT_VERSION=5.6.2 +QT_VERSION=5.7.1 ./genode_qt5_configure diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure index cff4bb148..1a826e69a 100755 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure +++ b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure @@ -1,6 +1,6 @@ #!/bin/sh -../qt-everywhere-opensource-src-5.6.2/configure \ +../qt-everywhere-opensource-src-5.7.1/configure \ -opensource \ -confirm-license \ -qconfig genode \