mirror of
https://github.com/genodelabs/genode.git
synced 2025-01-23 04:48:17 +00:00
parent
d00cfd7cff
commit
65f402807f
@ -98,75 +98,69 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
|
|||||||
|
|
||||||
~QNitpickerPlatformWindow();
|
~QNitpickerPlatformWindow();
|
||||||
|
|
||||||
QWindow *window() const;
|
QSurfaceFormat format() const override;
|
||||||
|
|
||||||
QPlatformWindow *parent() const;
|
void setGeometry(const QRect &rect) override;
|
||||||
|
|
||||||
QPlatformScreen *screen() const;
|
QRect geometry() const override;
|
||||||
|
|
||||||
QSurfaceFormat format() const;
|
QMargins frameMargins() const override;
|
||||||
|
|
||||||
void setGeometry(const QRect &rect);
|
void setVisible(bool visible) override;
|
||||||
|
|
||||||
QRect geometry() const;
|
void setWindowFlags(Qt::WindowFlags flags) override;
|
||||||
|
|
||||||
QMargins frameMargins() const;
|
void setWindowState(Qt::WindowStates state) override;
|
||||||
|
|
||||||
void setVisible(bool visible);
|
WId winId() const override;
|
||||||
|
|
||||||
void setWindowFlags(Qt::WindowFlags flags);
|
void setParent(const QPlatformWindow *window) override;
|
||||||
|
|
||||||
void setWindowState(Qt::WindowState state);
|
void setWindowTitle(const QString &title) override;
|
||||||
|
|
||||||
WId winId() const;
|
void setWindowFilePath(const QString &title) override;
|
||||||
|
|
||||||
void setParent(const QPlatformWindow *window);
|
void setWindowIcon(const QIcon &icon) override;
|
||||||
|
|
||||||
void setWindowTitle(const QString &title);
|
void raise() override;
|
||||||
|
|
||||||
void setWindowFilePath(const QString &title);
|
void lower() override;
|
||||||
|
|
||||||
void setWindowIcon(const QIcon &icon);
|
bool isExposed() const override;
|
||||||
|
|
||||||
void raise();
|
bool isActive() const override;
|
||||||
|
|
||||||
void lower();
|
bool isEmbedded() const override;
|
||||||
|
|
||||||
bool isExposed() const;
|
QPoint mapToGlobal(const QPoint &pos) const override;
|
||||||
|
|
||||||
bool isActive() const;
|
QPoint mapFromGlobal(const QPoint &pos) const override;
|
||||||
|
|
||||||
bool isEmbedded(const QPlatformWindow *parentWindow) const;
|
void propagateSizeHints() override;
|
||||||
|
|
||||||
QPoint mapToGlobal(const QPoint &pos) const;
|
void setOpacity(qreal level) override;
|
||||||
|
|
||||||
QPoint mapFromGlobal(const QPoint &pos) const;
|
void setMask(const QRegion ®ion) override;
|
||||||
|
|
||||||
void propagateSizeHints();
|
void requestActivateWindow() override;
|
||||||
|
|
||||||
void setOpacity(qreal level);
|
void handleContentOrientationChange(Qt::ScreenOrientation orientation) override;
|
||||||
|
|
||||||
void setMask(const QRegion ®ion);
|
qreal devicePixelRatio() const override;
|
||||||
|
|
||||||
void requestActivateWindow();
|
bool setKeyboardGrabEnabled(bool grab) override;
|
||||||
|
|
||||||
void handleContentOrientationChange(Qt::ScreenOrientation orientation);
|
bool setMouseGrabEnabled(bool grab) override;
|
||||||
|
|
||||||
qreal devicePixelRatio() const;
|
bool setWindowModified(bool modified) override;
|
||||||
|
|
||||||
bool setKeyboardGrabEnabled(bool grab);
|
bool windowEvent(QEvent *event) override;
|
||||||
|
|
||||||
bool setMouseGrabEnabled(bool grab);
|
bool startSystemResize(const QPoint &pos, Qt::Corner corner) override;
|
||||||
|
|
||||||
bool setWindowModified(bool modified);
|
void setFrameStrutEventsEnabled(bool enabled) override;
|
||||||
|
|
||||||
void windowEvent(QEvent *event);
|
bool frameStrutEventsEnabled() const override;
|
||||||
|
|
||||||
bool startSystemResize(const QPoint &pos, Qt::Corner corner);
|
|
||||||
|
|
||||||
void setFrameStrutEventsEnabled(bool enabled);
|
|
||||||
|
|
||||||
bool frameStrutEventsEnabled() const;
|
|
||||||
|
|
||||||
|
|
||||||
/* for QNitpickerWindowSurface */
|
/* for QNitpickerWindowSurface */
|
||||||
|
@ -9,7 +9,7 @@ ifneq ($(INHIBIT_QT5),)
|
|||||||
REQUIRES += removal_of_INHIBIT_QT5_env_var
|
REQUIRES += removal_of_INHIBIT_QT5_env_var
|
||||||
endif
|
endif
|
||||||
|
|
||||||
QT_VERSION := 5.8.0
|
QT_VERSION := 5.13.0
|
||||||
|
|
||||||
# identify the qt5 repository by searching for a file that is unique for qt5
|
# identify the qt5 repository by searching for a file that is unique for qt5
|
||||||
QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc)
|
QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc)
|
||||||
@ -40,7 +40,7 @@ CC_OPT += $(QT_DEFINES)
|
|||||||
#
|
#
|
||||||
# Locations of moc, rcc, and uic binaries
|
# Locations of moc, rcc, and uic binaries
|
||||||
#
|
#
|
||||||
QT5_HOST_TOOL_INSTALL_LOCATION ?= /usr/local/genode-qt5
|
QT5_HOST_TOOL_INSTALL_LOCATION ?= /usr/local/genode/qt5/19.08
|
||||||
MOC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/moc
|
MOC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/moc
|
||||||
RCC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/rcc
|
RCC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/rcc
|
||||||
UIC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/uic
|
UIC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/uic
|
||||||
|
3
repos/libports/lib/import/import-qt5_pcre2.mk
Normal file
3
repos/libports/lib/import/import-qt5_pcre2.mk
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc)
|
||||||
|
|
||||||
|
include $(IMPORT_QT5_INC)
|
@ -13,3 +13,5 @@ QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport
|
|||||||
QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)
|
QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)
|
||||||
QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)/QtPrintSupport
|
QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)/QtPrintSupport
|
||||||
QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)/QtPrintSupport/private
|
QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)/QtPrintSupport/private
|
||||||
|
|
||||||
|
CC_CXX_OPT += -DQT_PRINTSUPPORT_LIB
|
||||||
|
15
repos/libports/lib/import/import-qt5_virtualkeyboard.mk
Normal file
15
repos/libports/lib/import/import-qt5_virtualkeyboard.mk
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc)
|
||||||
|
|
||||||
|
include $(IMPORT_QT5_INC)
|
||||||
|
|
||||||
|
ifeq ($(CONTRIB_DIR),)
|
||||||
|
QT5_VIRTUALKEYBOARD_INC_DIR := $(realpath $(call select_from_repositories,include/QtVirtualKeyboard)/..)
|
||||||
|
else
|
||||||
|
QT5_VIRTUALKEYBOARD_INC_DIR := $(QT5_PORT_DIR)/include
|
||||||
|
endif
|
||||||
|
|
||||||
|
QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)
|
||||||
|
QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard
|
||||||
|
QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard/$(QT_VERSION)
|
||||||
|
QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard/$(QT_VERSION)/QtVirtualKeyboard
|
||||||
|
QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard/$(QT_VERSION)/QtVirtualKeyboard/private
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_ANGLE -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG
|
QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_ANGLE -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtwebkit/Source/ThirdParty/ANGLE \
|
qtwebkit/Source/ThirdParty/ANGLE \
|
||||||
|
@ -19,9 +19,6 @@ QT_SOURCES_FILTER_OUT = \
|
|||||||
|
|
||||||
# remove unneeded files to prevent moc warnings
|
# remove unneeded files to prevent moc warnings
|
||||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
|
||||||
moc_qobjectdefs.cpp \
|
|
||||||
moc_qprocess.cpp \
|
|
||||||
moc_qsharedmemory.cpp
|
|
||||||
|
|
||||||
include $(REP_DIR)/lib/mk/qt5.inc
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
@ -29,6 +26,6 @@ include $(REP_DIR)/lib/mk/qt5.inc
|
|||||||
SRC_CC += libc_dummies.cc
|
SRC_CC += libc_dummies.cc
|
||||||
vpath libc_dummies.cc $(REP_DIR)/src/lib/qt5
|
vpath libc_dummies.cc $(REP_DIR)/src/lib/qt5
|
||||||
|
|
||||||
LIBS += zlib pcre16 libc libm libc_pipe
|
LIBS += zlib qt5_pcre2 libc libm libc_pipe
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DPCRE2_CODE_UNIT_WIDTH=16
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/corelib \
|
qtbase/src/corelib \
|
||||||
@ -6,14 +6,16 @@ QT_INCPATH += \
|
|||||||
qtbase/src/3rdparty/md5 \
|
qtbase/src/3rdparty/md5 \
|
||||||
qtbase/src/3rdparty/md4 \
|
qtbase/src/3rdparty/md4 \
|
||||||
qtbase/src/3rdparty/sha3 \
|
qtbase/src/3rdparty/sha3 \
|
||||||
|
qtbase/src/3rdparty \
|
||||||
qtbase/src/3rdparty/double-conversion/include \
|
qtbase/src/3rdparty/double-conversion/include \
|
||||||
qtbase/src/3rdparty/double-conversion/include/double-conversion \
|
qtbase/src/3rdparty/double-conversion/include/double-conversion \
|
||||||
qtbase/src/3rdparty/forkfd \
|
qtbase/src/3rdparty/forkfd \
|
||||||
|
qtbase/src/3rdparty/tinycbor/src \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/src/3rdparty/pcre \
|
qtbase/src/3rdparty/pcre2/src \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
QT_SOURCES += \
|
QT_SOURCES += \
|
||||||
@ -24,29 +26,33 @@ QT_SOURCES += \
|
|||||||
qsequentialanimationgroup.cpp \
|
qsequentialanimationgroup.cpp \
|
||||||
qparallelanimationgroup.cpp \
|
qparallelanimationgroup.cpp \
|
||||||
qpauseanimation.cpp \
|
qpauseanimation.cpp \
|
||||||
|
qendian.cpp \
|
||||||
qglobal.cpp \
|
qglobal.cpp \
|
||||||
qglobalstatic.cpp \
|
|
||||||
qlibraryinfo.cpp \
|
qlibraryinfo.cpp \
|
||||||
qmalloc.cpp \
|
qmalloc.cpp \
|
||||||
qnumeric.cpp \
|
qnumeric.cpp \
|
||||||
|
qfloat16.cpp \
|
||||||
|
qoperatingsystemversion.cpp \
|
||||||
qlogging.cpp \
|
qlogging.cpp \
|
||||||
|
qrandom.cpp \
|
||||||
qhooks.cpp \
|
qhooks.cpp \
|
||||||
|
minimum-linux.S \
|
||||||
qversiontagging.cpp \
|
qversiontagging.cpp \
|
||||||
qatomic.cpp \
|
|
||||||
qexception.cpp \
|
|
||||||
qresultstore.cpp \
|
|
||||||
qfutureinterface.cpp \
|
|
||||||
qfuturewatcher.cpp \
|
|
||||||
qmutex.cpp \
|
|
||||||
qreadwritelock.cpp \
|
|
||||||
qrunnable.cpp \
|
qrunnable.cpp \
|
||||||
qmutexpool.cpp \
|
|
||||||
qsemaphore.cpp \
|
|
||||||
qthread.cpp \
|
qthread.cpp \
|
||||||
|
qthread_unix.cpp \
|
||||||
|
qatomic.cpp \
|
||||||
|
qmutex.cpp \
|
||||||
|
qmutexpool.cpp \
|
||||||
|
qreadwritelock.cpp \
|
||||||
|
qsemaphore.cpp \
|
||||||
qthreadpool.cpp \
|
qthreadpool.cpp \
|
||||||
qthreadstorage.cpp \
|
qthreadstorage.cpp \
|
||||||
qthread_unix.cpp \
|
|
||||||
qwaitcondition_unix.cpp \
|
qwaitcondition_unix.cpp \
|
||||||
|
qexception.cpp \
|
||||||
|
qfutureinterface.cpp \
|
||||||
|
qfuturewatcher.cpp \
|
||||||
|
qresultstore.cpp \
|
||||||
qarraydata.cpp \
|
qarraydata.cpp \
|
||||||
qbitarray.cpp \
|
qbitarray.cpp \
|
||||||
qbytearray.cpp \
|
qbytearray.cpp \
|
||||||
@ -55,7 +61,6 @@ QT_SOURCES += \
|
|||||||
qcollator.cpp \
|
qcollator.cpp \
|
||||||
qcryptographichash.cpp \
|
qcryptographichash.cpp \
|
||||||
qdatetime.cpp \
|
qdatetime.cpp \
|
||||||
qdatetimeparser.cpp \
|
|
||||||
qeasingcurve.cpp \
|
qeasingcurve.cpp \
|
||||||
qfreelist.cpp \
|
qfreelist.cpp \
|
||||||
qhash.cpp \
|
qhash.cpp \
|
||||||
@ -80,10 +85,10 @@ QT_SOURCES += \
|
|||||||
qstring.cpp \
|
qstring.cpp \
|
||||||
qstringbuilder.cpp \
|
qstringbuilder.cpp \
|
||||||
qstringlist.cpp \
|
qstringlist.cpp \
|
||||||
|
qstringview.cpp \
|
||||||
qtextboundaryfinder.cpp \
|
qtextboundaryfinder.cpp \
|
||||||
qtimeline.cpp \
|
qtimeline.cpp \
|
||||||
qunicodetools.cpp \
|
qunicodetools.cpp \
|
||||||
qvector.cpp \
|
|
||||||
qvsnprintf.cpp \
|
qvsnprintf.cpp \
|
||||||
qversionnumber.cpp \
|
qversionnumber.cpp \
|
||||||
qlocale_unix.cpp \
|
qlocale_unix.cpp \
|
||||||
@ -91,6 +96,7 @@ QT_SOURCES += \
|
|||||||
qtimezone.cpp \
|
qtimezone.cpp \
|
||||||
qtimezoneprivate.cpp \
|
qtimezoneprivate.cpp \
|
||||||
qtimezoneprivate_tz.cpp \
|
qtimezoneprivate_tz.cpp \
|
||||||
|
qdatetimeparser.cpp \
|
||||||
qregularexpression.cpp \
|
qregularexpression.cpp \
|
||||||
qcommandlineoption.cpp \
|
qcommandlineoption.cpp \
|
||||||
qcommandlineparser.cpp \
|
qcommandlineparser.cpp \
|
||||||
@ -113,7 +119,6 @@ QT_SOURCES += \
|
|||||||
strtod.cc \
|
strtod.cc \
|
||||||
qabstractfileengine.cpp \
|
qabstractfileengine.cpp \
|
||||||
qbuffer.cpp \
|
qbuffer.cpp \
|
||||||
qdatastream.cpp \
|
|
||||||
qdataurl.cpp \
|
qdataurl.cpp \
|
||||||
qtldurl.cpp \
|
qtldurl.cpp \
|
||||||
qdebug.cpp \
|
qdebug.cpp \
|
||||||
@ -126,9 +131,7 @@ QT_SOURCES += \
|
|||||||
qiodevice.cpp \
|
qiodevice.cpp \
|
||||||
qlockfile.cpp \
|
qlockfile.cpp \
|
||||||
qnoncontiguousbytedevice.cpp \
|
qnoncontiguousbytedevice.cpp \
|
||||||
qprocess.cpp \
|
|
||||||
qstorageinfo.cpp \
|
qstorageinfo.cpp \
|
||||||
qtextstream.cpp \
|
|
||||||
qtemporarydir.cpp \
|
qtemporarydir.cpp \
|
||||||
qtemporaryfile.cpp \
|
qtemporaryfile.cpp \
|
||||||
qresource.cpp \
|
qresource.cpp \
|
||||||
@ -139,38 +142,33 @@ QT_SOURCES += \
|
|||||||
qurlidna.cpp \
|
qurlidna.cpp \
|
||||||
qurlquery.cpp \
|
qurlquery.cpp \
|
||||||
qurlrecode.cpp \
|
qurlrecode.cpp \
|
||||||
qsettings.cpp \
|
|
||||||
qfsfileengine.cpp \
|
qfsfileengine.cpp \
|
||||||
qfsfileengine_iterator.cpp \
|
qfsfileengine_iterator.cpp \
|
||||||
qfilesystemwatcher.cpp \
|
|
||||||
qfilesystemwatcher_polling.cpp \
|
|
||||||
qfilesystementry.cpp \
|
qfilesystementry.cpp \
|
||||||
qfilesystemengine.cpp \
|
qfilesystemengine.cpp \
|
||||||
qfileselector.cpp \
|
qfileselector.cpp \
|
||||||
qloggingcategory.cpp \
|
qloggingcategory.cpp \
|
||||||
qloggingregistry.cpp \
|
qloggingregistry.cpp \
|
||||||
|
qfilesystemwatcher.cpp \
|
||||||
|
qfilesystemwatcher_polling.cpp \
|
||||||
|
qprocess.cpp \
|
||||||
|
qprocess_unix.cpp \
|
||||||
|
qsettings.cpp \
|
||||||
qfsfileengine_unix.cpp \
|
qfsfileengine_unix.cpp \
|
||||||
qfilesystemengine_unix.cpp \
|
qfilesystemengine_unix.cpp \
|
||||||
qlockfile_unix.cpp \
|
qlockfile_unix.cpp \
|
||||||
qprocess_unix.cpp \
|
|
||||||
qfilesystemiterator_unix.cpp \
|
qfilesystemiterator_unix.cpp \
|
||||||
forkfd_qt.cpp \
|
forkfd_qt.cpp \
|
||||||
qstandardpaths_unix.cpp \
|
qstandardpaths_unix.cpp \
|
||||||
qstorageinfo_stub.cpp \
|
qstorageinfo_stub.cpp \
|
||||||
qfilesystemwatcher_inotify.cpp \
|
|
||||||
qabstractitemmodel.cpp \
|
qabstractitemmodel.cpp \
|
||||||
qabstractproxymodel.cpp \
|
|
||||||
qitemselectionmodel.cpp \
|
qitemselectionmodel.cpp \
|
||||||
|
qabstractproxymodel.cpp \
|
||||||
|
qconcatenatetablesproxymodel.cpp \
|
||||||
qidentityproxymodel.cpp \
|
qidentityproxymodel.cpp \
|
||||||
qsortfilterproxymodel.cpp \
|
qsortfilterproxymodel.cpp \
|
||||||
|
qtransposeproxymodel.cpp \
|
||||||
qstringlistmodel.cpp \
|
qstringlistmodel.cpp \
|
||||||
qjson.cpp \
|
|
||||||
qjsondocument.cpp \
|
|
||||||
qjsonobject.cpp \
|
|
||||||
qjsonarray.cpp \
|
|
||||||
qjsonvalue.cpp \
|
|
||||||
qjsonwriter.cpp \
|
|
||||||
qjsonparser.cpp \
|
|
||||||
qfactoryinterface.cpp \
|
qfactoryinterface.cpp \
|
||||||
qpluginloader.cpp \
|
qpluginloader.cpp \
|
||||||
qfactoryloader.cpp \
|
qfactoryloader.cpp \
|
||||||
@ -204,6 +202,7 @@ QT_SOURCES += \
|
|||||||
qpointer.cpp \
|
qpointer.cpp \
|
||||||
qmath.cpp \
|
qmath.cpp \
|
||||||
qsystemerror.cpp \
|
qsystemerror.cpp \
|
||||||
|
qtestsupport_core.cpp \
|
||||||
qcore_unix.cpp \
|
qcore_unix.cpp \
|
||||||
qeventdispatcher_unix.cpp \
|
qeventdispatcher_unix.cpp \
|
||||||
qtimerinfo_unix.cpp \
|
qtimerinfo_unix.cpp \
|
||||||
@ -214,12 +213,12 @@ QT_SOURCES += \
|
|||||||
qsystemsemaphore_posix.cpp \
|
qsystemsemaphore_posix.cpp \
|
||||||
qsystemsemaphore_systemv.cpp \
|
qsystemsemaphore_systemv.cpp \
|
||||||
qsystemsemaphore_unix.cpp \
|
qsystemsemaphore_unix.cpp \
|
||||||
qisciicodec.cpp \
|
qutfcodec.cpp \
|
||||||
qlatincodec.cpp \
|
qlatincodec.cpp \
|
||||||
qsimplecodec.cpp \
|
qsimplecodec.cpp \
|
||||||
qtextcodec.cpp \
|
qtextcodec.cpp \
|
||||||
|
qisciicodec.cpp \
|
||||||
qtsciicodec.cpp \
|
qtsciicodec.cpp \
|
||||||
qutfcodec.cpp \
|
|
||||||
qgb18030codec.cpp \
|
qgb18030codec.cpp \
|
||||||
qjpunicode.cpp \
|
qjpunicode.cpp \
|
||||||
qeucjpcodec.cpp \
|
qeucjpcodec.cpp \
|
||||||
@ -227,6 +226,21 @@ QT_SOURCES += \
|
|||||||
qsjiscodec.cpp \
|
qsjiscodec.cpp \
|
||||||
qeuckrcodec.cpp \
|
qeuckrcodec.cpp \
|
||||||
qbig5codec.cpp \
|
qbig5codec.cpp \
|
||||||
|
qcborstream.cpp \
|
||||||
|
qcbordiagnostic.cpp \
|
||||||
|
qcborvalue.cpp \
|
||||||
|
qdatastream.cpp \
|
||||||
|
qjson.cpp \
|
||||||
|
qjsoncbor.cpp \
|
||||||
|
qjsondocument.cpp \
|
||||||
|
qjsonobject.cpp \
|
||||||
|
qjsonarray.cpp \
|
||||||
|
qjsonvalue.cpp \
|
||||||
|
qjsonwriter.cpp \
|
||||||
|
qjsonparser.cpp \
|
||||||
|
qtextstream.cpp \
|
||||||
|
qxmlstream.cpp \
|
||||||
|
qxmlutils.cpp \
|
||||||
qstatemachine.cpp \
|
qstatemachine.cpp \
|
||||||
qabstractstate.cpp \
|
qabstractstate.cpp \
|
||||||
qstate.cpp \
|
qstate.cpp \
|
||||||
@ -242,56 +256,10 @@ QT_SOURCES += \
|
|||||||
qmimemagicrule.cpp \
|
qmimemagicrule.cpp \
|
||||||
qmimeglobpattern.cpp \
|
qmimeglobpattern.cpp \
|
||||||
qmimeprovider.cpp \
|
qmimeprovider.cpp \
|
||||||
qxmlstream.cpp \
|
qfloat16tables.cpp \
|
||||||
qxmlutils.cpp \
|
|
||||||
qstring_compat.cpp \
|
|
||||||
qrc_mimetypes.cpp \
|
qrc_mimetypes.cpp \
|
||||||
moc_qabstractanimation_p.cpp \
|
moc_qtransposeproxymodel.cpp \
|
||||||
moc_qnamespace.cpp \
|
moc_qmimetype.cpp
|
||||||
moc_qthread.cpp \
|
|
||||||
moc_qthreadpool.cpp \
|
|
||||||
moc_qfuturewatcher.cpp \
|
|
||||||
moc_qcryptographichash.cpp \
|
|
||||||
moc_qeasingcurve.cpp \
|
|
||||||
moc_qlocale.cpp \
|
|
||||||
moc_qtimeline.cpp \
|
|
||||||
moc_qfile.cpp \
|
|
||||||
moc_qfiledevice.cpp \
|
|
||||||
moc_qiodevice.cpp \
|
|
||||||
moc_qnoncontiguousbytedevice_p.cpp \
|
|
||||||
moc_qtextstream_p.cpp \
|
|
||||||
moc_qtemporaryfile.cpp \
|
|
||||||
moc_qsavefile.cpp \
|
|
||||||
moc_qstandardpaths.cpp \
|
|
||||||
moc_qsettings.cpp \
|
|
||||||
moc_qfilesystemwatcher_p.cpp \
|
|
||||||
moc_qfilesystemwatcher_polling_p.cpp \
|
|
||||||
moc_qfilesystemwatcher_inotify_p.cpp \
|
|
||||||
moc_qabstractitemmodel.cpp \
|
|
||||||
moc_qstringlistmodel.cpp \
|
|
||||||
moc_qpluginloader.cpp \
|
|
||||||
moc_qlibrary.cpp \
|
|
||||||
moc_qfactoryloader_p.cpp \
|
|
||||||
moc_qabstracteventdispatcher.cpp \
|
|
||||||
moc_qeventloop.cpp \
|
|
||||||
moc_qcoreapplication.cpp \
|
|
||||||
moc_qcoreevent.cpp \
|
|
||||||
moc_qmimedata.cpp \
|
|
||||||
moc_qobjectdefs.cpp \
|
|
||||||
moc_qsocketnotifier.cpp \
|
|
||||||
moc_qtimer.cpp \
|
|
||||||
moc_qtranslator.cpp \
|
|
||||||
moc_qobjectcleanuphandler.cpp \
|
|
||||||
moc_qsharedmemory.cpp \
|
|
||||||
moc_qeventdispatcher_unix_p.cpp \
|
|
||||||
moc_qabstractstate.cpp \
|
|
||||||
moc_qstate.cpp \
|
|
||||||
moc_qfinalstate.cpp \
|
|
||||||
moc_qhistorystate.cpp \
|
|
||||||
moc_qhistorystate_p.cpp \
|
|
||||||
moc_qabstracttransition.cpp \
|
|
||||||
moc_qsignaltransition.cpp \
|
|
||||||
moc_qeventtransition.cpp
|
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtbase/src/3rdparty/double-conversion \
|
qtbase/src/3rdparty/double-conversion \
|
||||||
@ -301,14 +269,14 @@ QT_VPATH += \
|
|||||||
qtbase/src/corelib/global \
|
qtbase/src/corelib/global \
|
||||||
qtbase/src/corelib/io \
|
qtbase/src/corelib/io \
|
||||||
qtbase/src/corelib/itemmodels \
|
qtbase/src/corelib/itemmodels \
|
||||||
qtbase/src/corelib/json \
|
|
||||||
qtbase/src/corelib/kernel \
|
qtbase/src/corelib/kernel \
|
||||||
qtbase/src/corelib/mimetypes \
|
qtbase/src/corelib/mimetypes \
|
||||||
qtbase/src/corelib/plugin \
|
qtbase/src/corelib/plugin \
|
||||||
|
qtbase/src/corelib/serialization \
|
||||||
qtbase/src/corelib/statemachine \
|
qtbase/src/corelib/statemachine \
|
||||||
qtbase/src/corelib/thread \
|
qtbase/src/corelib/thread \
|
||||||
qtbase/src/corelib/tools \
|
qtbase/src/corelib/tools \
|
||||||
qtbase/src/corelib/xml \
|
qtbase/src/corelib/tools/qstring_compat.cpp global \
|
||||||
|
|
||||||
# some source files need to be generated by moc from other source/header files before
|
# some source files need to be generated by moc from other source/header files before
|
||||||
# they get #included again by the original source file in the compiling stage
|
# they get #included again by the original source file in the compiling stage
|
||||||
@ -338,33 +306,32 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qfiledevice.cpp \
|
moc_qfiledevice.cpp \
|
||||||
moc_qiodevice.cpp \
|
moc_qiodevice.cpp \
|
||||||
moc_qnoncontiguousbytedevice_p.cpp \
|
moc_qnoncontiguousbytedevice_p.cpp \
|
||||||
moc_qprocess.cpp \
|
|
||||||
moc_qtextstream_p.cpp \
|
|
||||||
moc_qtemporaryfile.cpp \
|
moc_qtemporaryfile.cpp \
|
||||||
moc_qsavefile.cpp \
|
moc_qsavefile.cpp \
|
||||||
moc_qstandardpaths.cpp \
|
moc_qstandardpaths.cpp \
|
||||||
moc_qsettings.cpp \
|
moc_qfileselector.cpp \
|
||||||
moc_qfilesystemwatcher.cpp \
|
moc_qfilesystemwatcher.cpp \
|
||||||
moc_qfilesystemwatcher_p.cpp \
|
moc_qfilesystemwatcher_p.cpp \
|
||||||
moc_qfilesystemwatcher_polling_p.cpp \
|
moc_qfilesystemwatcher_polling_p.cpp \
|
||||||
moc_qfileselector.cpp \
|
moc_qprocess.cpp \
|
||||||
moc_qfilesystemwatcher_inotify_p.cpp \
|
moc_qsettings.cpp \
|
||||||
moc_qabstractitemmodel.cpp \
|
moc_qabstractitemmodel.cpp \
|
||||||
moc_qabstractproxymodel.cpp \
|
|
||||||
moc_qitemselectionmodel.cpp \
|
moc_qitemselectionmodel.cpp \
|
||||||
|
moc_qabstractproxymodel.cpp \
|
||||||
|
moc_qconcatenatetablesproxymodel.cpp \
|
||||||
moc_qidentityproxymodel.cpp \
|
moc_qidentityproxymodel.cpp \
|
||||||
moc_qsortfilterproxymodel.cpp \
|
moc_qsortfilterproxymodel.cpp \
|
||||||
|
moc_qtransposeproxymodel.cpp \
|
||||||
moc_qstringlistmodel.cpp \
|
moc_qstringlistmodel.cpp \
|
||||||
moc_qpluginloader.cpp \
|
moc_qpluginloader.cpp \
|
||||||
moc_qlibrary.cpp \
|
|
||||||
moc_qfactoryloader_p.cpp \
|
moc_qfactoryloader_p.cpp \
|
||||||
|
moc_qlibrary.cpp \
|
||||||
moc_qabstracteventdispatcher.cpp \
|
moc_qabstracteventdispatcher.cpp \
|
||||||
moc_qeventloop.cpp \
|
moc_qeventloop.cpp \
|
||||||
moc_qcoreapplication.cpp \
|
moc_qcoreapplication.cpp \
|
||||||
moc_qcoreevent.cpp \
|
moc_qcoreevent.cpp \
|
||||||
moc_qmimedata.cpp \
|
moc_qmimedata.cpp \
|
||||||
moc_qobject.cpp \
|
moc_qobject.cpp \
|
||||||
moc_qobjectdefs.cpp \
|
|
||||||
moc_qsignalmapper.cpp \
|
moc_qsignalmapper.cpp \
|
||||||
moc_qsocketnotifier.cpp \
|
moc_qsocketnotifier.cpp \
|
||||||
moc_qtimer.cpp \
|
moc_qtimer.cpp \
|
||||||
@ -372,20 +339,25 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qobjectcleanuphandler.cpp \
|
moc_qobjectcleanuphandler.cpp \
|
||||||
moc_qsharedmemory.cpp \
|
moc_qsharedmemory.cpp \
|
||||||
moc_qeventdispatcher_unix_p.cpp \
|
moc_qeventdispatcher_unix_p.cpp \
|
||||||
|
moc_qcborcommon.cpp \
|
||||||
|
moc_qcborvalue.cpp \
|
||||||
|
moc_qcborstream.cpp \
|
||||||
|
moc_qtextstream_p.cpp \
|
||||||
moc_qstatemachine.cpp \
|
moc_qstatemachine.cpp \
|
||||||
moc_qabstractstate.cpp \
|
moc_qabstractstate.cpp \
|
||||||
moc_qstate.cpp \
|
moc_qstate.cpp \
|
||||||
moc_qfinalstate.cpp \
|
moc_qfinalstate.cpp \
|
||||||
moc_qhistorystate.cpp \
|
moc_qhistorystate.cpp \
|
||||||
moc_qhistorystate_p.cpp \
|
|
||||||
moc_qabstracttransition.cpp \
|
moc_qabstracttransition.cpp \
|
||||||
moc_qsignaltransition.cpp \
|
moc_qsignaltransition.cpp \
|
||||||
moc_qeventtransition.cpp
|
moc_qeventtransition.cpp \
|
||||||
|
moc_qmimetype.cpp
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
|
||||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||||
qtimer.moc \
|
qtimer.moc \
|
||||||
qstatemachine.moc
|
qstatemachine.moc \
|
||||||
|
qhistorystate.moc
|
||||||
|
|
||||||
|
@ -17,7 +17,8 @@ QT_SOURCES_FILTER_OUT = \
|
|||||||
|
|
||||||
# remove unneeded files to prevent moc warnings
|
# remove unneeded files to prevent moc warnings
|
||||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
|
||||||
moc_qsessionmanager.cpp
|
moc_qsessionmanager.cpp \
|
||||||
|
qrc_qmake_webgradients.cpp
|
||||||
|
|
||||||
include $(REP_DIR)/lib/mk/qt5.inc
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DENABLE_PIXMAN_DRAWHELPERS -DQT_BUILD_GUI_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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DENABLE_PIXMAN_DRAWHELPERS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_GUI_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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/gui \
|
qtbase/src/gui \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
@ -19,7 +19,6 @@ QT_SOURCES += \
|
|||||||
qplatforminputcontextplugin.cpp \
|
qplatforminputcontextplugin.cpp \
|
||||||
qplatforminputcontext.cpp \
|
qplatforminputcontext.cpp \
|
||||||
qplatformintegration.cpp \
|
qplatformintegration.cpp \
|
||||||
qplatformdrag.cpp \
|
|
||||||
qplatformscreen.cpp \
|
qplatformscreen.cpp \
|
||||||
qplatformintegrationfactory.cpp \
|
qplatformintegrationfactory.cpp \
|
||||||
qplatformintegrationplugin.cpp \
|
qplatformintegrationplugin.cpp \
|
||||||
@ -32,8 +31,6 @@ QT_SOURCES += \
|
|||||||
qplatformclipboard.cpp \
|
qplatformclipboard.cpp \
|
||||||
qplatformnativeinterface.cpp \
|
qplatformnativeinterface.cpp \
|
||||||
qsessionmanager.cpp \
|
qsessionmanager.cpp \
|
||||||
qshapedpixmapdndwindow.cpp \
|
|
||||||
qsimpledrag.cpp \
|
|
||||||
qsurfaceformat.cpp \
|
qsurfaceformat.cpp \
|
||||||
qguiapplication.cpp \
|
qguiapplication.cpp \
|
||||||
qwindow.cpp \
|
qwindow.cpp \
|
||||||
@ -42,10 +39,9 @@ QT_SOURCES += \
|
|||||||
qsurface.cpp \
|
qsurface.cpp \
|
||||||
qclipboard.cpp \
|
qclipboard.cpp \
|
||||||
qcursor.cpp \
|
qcursor.cpp \
|
||||||
qdrag.cpp \
|
|
||||||
qdnd.cpp \
|
|
||||||
qevent.cpp \
|
qevent.cpp \
|
||||||
qinputmethod.cpp \
|
qinputmethod.cpp \
|
||||||
|
qinternalmimedata.cpp \
|
||||||
qkeysequence.cpp \
|
qkeysequence.cpp \
|
||||||
qkeymapper.cpp \
|
qkeymapper.cpp \
|
||||||
qpalette.cpp \
|
qpalette.cpp \
|
||||||
@ -67,6 +63,12 @@ QT_SOURCES += \
|
|||||||
qplatformgraphicsbufferhelper.cpp \
|
qplatformgraphicsbufferhelper.cpp \
|
||||||
qinputdevicemanager.cpp \
|
qinputdevicemanager.cpp \
|
||||||
qhighdpiscaling.cpp \
|
qhighdpiscaling.cpp \
|
||||||
|
qtestsupport_gui.cpp \
|
||||||
|
qdnd.cpp \
|
||||||
|
qdrag.cpp \
|
||||||
|
qplatformdrag.cpp \
|
||||||
|
qshapedpixmapdndwindow.cpp \
|
||||||
|
qsimpledrag.cpp \
|
||||||
qplatformopenglcontext.cpp \
|
qplatformopenglcontext.cpp \
|
||||||
qopenglcontext.cpp \
|
qopenglcontext.cpp \
|
||||||
qopenglwindow.cpp \
|
qopenglwindow.cpp \
|
||||||
@ -75,6 +77,7 @@ QT_SOURCES += \
|
|||||||
qimage_conversions.cpp \
|
qimage_conversions.cpp \
|
||||||
qimageiohandler.cpp \
|
qimageiohandler.cpp \
|
||||||
qimagereader.cpp \
|
qimagereader.cpp \
|
||||||
|
qimagereaderwriterhelpers.cpp \
|
||||||
qimagewriter.cpp \
|
qimagewriter.cpp \
|
||||||
qpaintengine_pic.cpp \
|
qpaintengine_pic.cpp \
|
||||||
qpicture.cpp \
|
qpicture.cpp \
|
||||||
@ -82,7 +85,6 @@ QT_SOURCES += \
|
|||||||
qpixmap.cpp \
|
qpixmap.cpp \
|
||||||
qpixmapcache.cpp \
|
qpixmapcache.cpp \
|
||||||
qplatformpixmap.cpp \
|
qplatformpixmap.cpp \
|
||||||
qmovie.cpp \
|
|
||||||
qpixmap_raster.cpp \
|
qpixmap_raster.cpp \
|
||||||
qpixmap_blitter.cpp \
|
qpixmap_blitter.cpp \
|
||||||
qimagepixmapcleanuphooks.cpp \
|
qimagepixmapcleanuphooks.cpp \
|
||||||
@ -90,6 +92,7 @@ QT_SOURCES += \
|
|||||||
qiconloader.cpp \
|
qiconloader.cpp \
|
||||||
qiconengine.cpp \
|
qiconengine.cpp \
|
||||||
qiconengineplugin.cpp \
|
qiconengineplugin.cpp \
|
||||||
|
qmovie.cpp \
|
||||||
qbmphandler.cpp \
|
qbmphandler.cpp \
|
||||||
qppmhandler.cpp \
|
qppmhandler.cpp \
|
||||||
qxbmhandler.cpp \
|
qxbmhandler.cpp \
|
||||||
@ -123,6 +126,7 @@ QT_SOURCES += \
|
|||||||
qrawfont.cpp \
|
qrawfont.cpp \
|
||||||
qglyphrun.cpp \
|
qglyphrun.cpp \
|
||||||
qdistancefield.cpp \
|
qdistancefield.cpp \
|
||||||
|
qinputcontrol.cpp \
|
||||||
qfontengine_qpf2.cpp \
|
qfontengine_qpf2.cpp \
|
||||||
qplatformfontdatabase.cpp \
|
qplatformfontdatabase.cpp \
|
||||||
qtextodfwriter.cpp \
|
qtextodfwriter.cpp \
|
||||||
@ -134,11 +138,10 @@ QT_SOURCES += \
|
|||||||
qblittable.cpp \
|
qblittable.cpp \
|
||||||
qbrush.cpp \
|
qbrush.cpp \
|
||||||
qcolor.cpp \
|
qcolor.cpp \
|
||||||
|
qcolorprofile.cpp \
|
||||||
qcompositionfunctions.cpp \
|
qcompositionfunctions.cpp \
|
||||||
qcosmeticstroker.cpp \
|
qcosmeticstroker.cpp \
|
||||||
qdrawhelper.cpp \
|
|
||||||
qemulationpaintengine.cpp \
|
qemulationpaintengine.cpp \
|
||||||
qgammatables.cpp \
|
|
||||||
qgrayraster.c \
|
qgrayraster.c \
|
||||||
qimagescale.cpp \
|
qimagescale.cpp \
|
||||||
qmatrix.cpp \
|
qmatrix.cpp \
|
||||||
@ -174,6 +177,19 @@ QT_SOURCES += \
|
|||||||
qgridlayoutengine.cpp \
|
qgridlayoutengine.cpp \
|
||||||
qabstractlayoutstyleinfo.cpp \
|
qabstractlayoutstyleinfo.cpp \
|
||||||
qlayoutpolicy.cpp \
|
qlayoutpolicy.cpp \
|
||||||
|
qshaderformat.cpp \
|
||||||
|
qshadergenerator.cpp \
|
||||||
|
qshadergraph.cpp \
|
||||||
|
qshadergraphloader.cpp \
|
||||||
|
qshaderlanguage.cpp \
|
||||||
|
qshadernode.cpp \
|
||||||
|
qshadernodeport.cpp \
|
||||||
|
qshadernodesloader.cpp \
|
||||||
|
qtexturefiledata.cpp \
|
||||||
|
qtexturefilereader.cpp \
|
||||||
|
qpkmhandler.cpp \
|
||||||
|
qktxhandler.cpp \
|
||||||
|
qastchandler.cpp \
|
||||||
qgenericmatrix.cpp \
|
qgenericmatrix.cpp \
|
||||||
qmatrix4x4.cpp \
|
qmatrix4x4.cpp \
|
||||||
qquaternion.cpp \
|
qquaternion.cpp \
|
||||||
@ -200,7 +216,9 @@ QT_SOURCES += \
|
|||||||
qopengltextureblitter.cpp \
|
qopengltextureblitter.cpp \
|
||||||
qopengltexture.cpp \
|
qopengltexture.cpp \
|
||||||
qopengltexturehelper.cpp \
|
qopengltexturehelper.cpp \
|
||||||
|
qopengltextureuploader.cpp \
|
||||||
qopenglpixeltransferoptions.cpp \
|
qopenglpixeltransferoptions.cpp \
|
||||||
|
qopenglprogrambinarycache.cpp \
|
||||||
qopenglfunctions_1_0.cpp \
|
qopenglfunctions_1_0.cpp \
|
||||||
qopenglfunctions_1_1.cpp \
|
qopenglfunctions_1_1.cpp \
|
||||||
qopenglfunctions_1_2.cpp \
|
qopenglfunctions_1_2.cpp \
|
||||||
@ -231,8 +249,10 @@ QT_SOURCES += \
|
|||||||
qguivariantanimation.cpp \
|
qguivariantanimation.cpp \
|
||||||
qstandarditemmodel.cpp \
|
qstandarditemmodel.cpp \
|
||||||
qimage_compat.cpp \
|
qimage_compat.cpp \
|
||||||
qimage_sse2.cpp \
|
qdrawhelper.cpp \
|
||||||
qdrawhelper_sse2.cpp \
|
qdrawhelper_sse2.cpp \
|
||||||
|
qrc_qpdf.cpp \
|
||||||
|
qrc_qmake_webgradients.cpp \
|
||||||
moc_qgenericplugin.cpp \
|
moc_qgenericplugin.cpp \
|
||||||
moc_qplatforminputcontext.cpp \
|
moc_qplatforminputcontext.cpp \
|
||||||
moc_qplatforminputcontextplugin_p.cpp \
|
moc_qplatforminputcontextplugin_p.cpp \
|
||||||
@ -240,13 +260,12 @@ QT_SOURCES += \
|
|||||||
moc_qplatformthemeplugin.cpp \
|
moc_qplatformthemeplugin.cpp \
|
||||||
moc_qplatformnativeinterface.cpp \
|
moc_qplatformnativeinterface.cpp \
|
||||||
moc_qplatformmenu.cpp \
|
moc_qplatformmenu.cpp \
|
||||||
moc_qshapedpixmapdndwindow_p.cpp \
|
|
||||||
moc_qsurfaceformat.cpp \
|
moc_qsurfaceformat.cpp \
|
||||||
moc_qoffscreensurface.cpp \
|
moc_qoffscreensurface.cpp \
|
||||||
|
moc_qsurface.cpp \
|
||||||
moc_qclipboard.cpp \
|
moc_qclipboard.cpp \
|
||||||
moc_qdrag.cpp \
|
|
||||||
moc_qdnd_p.cpp \
|
|
||||||
moc_qevent.cpp \
|
moc_qevent.cpp \
|
||||||
|
moc_qinternalmimedata_p.cpp \
|
||||||
moc_qkeysequence.cpp \
|
moc_qkeysequence.cpp \
|
||||||
moc_qkeymapper_p.cpp \
|
moc_qkeymapper_p.cpp \
|
||||||
moc_qpalette.cpp \
|
moc_qpalette.cpp \
|
||||||
@ -260,7 +279,11 @@ QT_SOURCES += \
|
|||||||
moc_qrasterwindow.cpp \
|
moc_qrasterwindow.cpp \
|
||||||
moc_qplatformgraphicsbuffer.cpp \
|
moc_qplatformgraphicsbuffer.cpp \
|
||||||
moc_qinputdevicemanager_p.cpp \
|
moc_qinputdevicemanager_p.cpp \
|
||||||
|
moc_qdnd_p.cpp \
|
||||||
|
moc_qdrag.cpp \
|
||||||
|
moc_qshapedpixmapdndwindow_p.cpp \
|
||||||
moc_qopenglwindow.cpp \
|
moc_qopenglwindow.cpp \
|
||||||
|
moc_qimage.cpp \
|
||||||
moc_qimageiohandler.cpp \
|
moc_qimageiohandler.cpp \
|
||||||
moc_qpictureformatplugin.cpp \
|
moc_qpictureformatplugin.cpp \
|
||||||
moc_qiconengineplugin.cpp \
|
moc_qiconengineplugin.cpp \
|
||||||
@ -272,11 +295,14 @@ QT_SOURCES += \
|
|||||||
moc_qtextimagehandler_p.cpp \
|
moc_qtextimagehandler_p.cpp \
|
||||||
moc_qtexttable.cpp \
|
moc_qtexttable.cpp \
|
||||||
moc_qtextlist.cpp \
|
moc_qtextlist.cpp \
|
||||||
|
moc_qinputcontrol_p.cpp \
|
||||||
moc_qbrush.cpp \
|
moc_qbrush.cpp \
|
||||||
moc_qpainter.cpp \
|
moc_qpainter.cpp \
|
||||||
moc_qpdfwriter.cpp \
|
moc_qpdfwriter.cpp \
|
||||||
moc_qplatformbackingstore.cpp \
|
moc_qplatformbackingstore.cpp \
|
||||||
moc_qvalidator.cpp \
|
moc_qvalidator.cpp \
|
||||||
|
moc_qlayoutpolicy_p.cpp \
|
||||||
|
moc_qshaderlanguage_p.cpp \
|
||||||
moc_qopenglshaderprogram.cpp \
|
moc_qopenglshaderprogram.cpp \
|
||||||
moc_qopenglengineshadermanager_p.cpp \
|
moc_qopenglengineshadermanager_p.cpp \
|
||||||
moc_qopengltexture.cpp \
|
moc_qopengltexture.cpp \
|
||||||
@ -307,16 +333,15 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qplatformthemeplugin.cpp \
|
moc_qplatformthemeplugin.cpp \
|
||||||
moc_qplatformnativeinterface.cpp \
|
moc_qplatformnativeinterface.cpp \
|
||||||
moc_qplatformmenu.cpp \
|
moc_qplatformmenu.cpp \
|
||||||
moc_qshapedpixmapdndwindow_p.cpp \
|
|
||||||
moc_qsurfaceformat.cpp \
|
moc_qsurfaceformat.cpp \
|
||||||
moc_qguiapplication.cpp \
|
moc_qguiapplication.cpp \
|
||||||
moc_qwindow.cpp \
|
moc_qwindow.cpp \
|
||||||
moc_qoffscreensurface.cpp \
|
moc_qoffscreensurface.cpp \
|
||||||
|
moc_qsurface.cpp \
|
||||||
moc_qclipboard.cpp \
|
moc_qclipboard.cpp \
|
||||||
moc_qdrag.cpp \
|
|
||||||
moc_qdnd_p.cpp \
|
|
||||||
moc_qevent.cpp \
|
moc_qevent.cpp \
|
||||||
moc_qinputmethod.cpp \
|
moc_qinputmethod.cpp \
|
||||||
|
moc_qinternalmimedata_p.cpp \
|
||||||
moc_qkeysequence.cpp \
|
moc_qkeysequence.cpp \
|
||||||
moc_qkeymapper_p.cpp \
|
moc_qkeymapper_p.cpp \
|
||||||
moc_qpalette.cpp \
|
moc_qpalette.cpp \
|
||||||
@ -331,12 +356,16 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qrasterwindow.cpp \
|
moc_qrasterwindow.cpp \
|
||||||
moc_qplatformgraphicsbuffer.cpp \
|
moc_qplatformgraphicsbuffer.cpp \
|
||||||
moc_qinputdevicemanager_p.cpp \
|
moc_qinputdevicemanager_p.cpp \
|
||||||
|
moc_qdnd_p.cpp \
|
||||||
|
moc_qdrag.cpp \
|
||||||
|
moc_qshapedpixmapdndwindow_p.cpp \
|
||||||
moc_qopenglcontext.cpp \
|
moc_qopenglcontext.cpp \
|
||||||
moc_qopenglwindow.cpp \
|
moc_qopenglwindow.cpp \
|
||||||
|
moc_qimage.cpp \
|
||||||
moc_qimageiohandler.cpp \
|
moc_qimageiohandler.cpp \
|
||||||
moc_qmovie.cpp \
|
|
||||||
moc_qpictureformatplugin.cpp \
|
moc_qpictureformatplugin.cpp \
|
||||||
moc_qiconengineplugin.cpp \
|
moc_qiconengineplugin.cpp \
|
||||||
|
moc_qmovie.cpp \
|
||||||
moc_qfont.cpp \
|
moc_qfont.cpp \
|
||||||
moc_qfontdatabase.cpp \
|
moc_qfontdatabase.cpp \
|
||||||
moc_qtextformat.cpp \
|
moc_qtextformat.cpp \
|
||||||
@ -348,11 +377,14 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qtexttable.cpp \
|
moc_qtexttable.cpp \
|
||||||
moc_qtextlist.cpp \
|
moc_qtextlist.cpp \
|
||||||
moc_qsyntaxhighlighter.cpp \
|
moc_qsyntaxhighlighter.cpp \
|
||||||
|
moc_qinputcontrol_p.cpp \
|
||||||
moc_qbrush.cpp \
|
moc_qbrush.cpp \
|
||||||
moc_qpainter.cpp \
|
moc_qpainter.cpp \
|
||||||
moc_qpdfwriter.cpp \
|
moc_qpdfwriter.cpp \
|
||||||
moc_qplatformbackingstore.cpp \
|
moc_qplatformbackingstore.cpp \
|
||||||
moc_qvalidator.cpp \
|
moc_qvalidator.cpp \
|
||||||
|
moc_qlayoutpolicy_p.cpp \
|
||||||
|
moc_qshaderlanguage_p.cpp \
|
||||||
moc_qopenglshaderprogram.cpp \
|
moc_qopenglshaderprogram.cpp \
|
||||||
moc_qopenglengineshadermanager_p.cpp \
|
moc_qopenglengineshadermanager_p.cpp \
|
||||||
moc_qopenglvertexarrayobject.cpp \
|
moc_qopenglvertexarrayobject.cpp \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_JavaScriptCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_JavaScriptCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtwebkit/Source/JavaScriptCore \
|
qtwebkit/Source/JavaScriptCore \
|
||||||
|
@ -1,27 +1,18 @@
|
|||||||
QT_DEFINES += -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/network \
|
qtbase/src/network \
|
||||||
qtbase/src/network/kernel \
|
qtbase/src/network/kernel \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtNetwork/5.8.0 \
|
qtbase/include/QtNetwork/5.13.0 \
|
||||||
qtbase/include/QtNetwork/5.8.0/QtNetwork \
|
qtbase/include/QtNetwork/5.13.0/QtNetwork \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
QT_SOURCES += \
|
QT_SOURCES += \
|
||||||
qftp.cpp \
|
|
||||||
qhttpnetworkheader.cpp \
|
|
||||||
qhttpnetworkrequest.cpp \
|
|
||||||
qhttpnetworkreply.cpp \
|
|
||||||
qhttpnetworkconnection.cpp \
|
|
||||||
qhttpnetworkconnectionchannel.cpp \
|
|
||||||
qabstractprotocolhandler.cpp \
|
|
||||||
qhttpprotocolhandler.cpp \
|
|
||||||
qspdyprotocolhandler.cpp \
|
|
||||||
qnetworkaccessauthenticationmanager.cpp \
|
qnetworkaccessauthenticationmanager.cpp \
|
||||||
qnetworkaccessmanager.cpp \
|
qnetworkaccessmanager.cpp \
|
||||||
qnetworkaccesscache.cpp \
|
qnetworkaccesscache.cpp \
|
||||||
@ -29,21 +20,21 @@ QT_SOURCES += \
|
|||||||
qnetworkaccessdebugpipebackend.cpp \
|
qnetworkaccessdebugpipebackend.cpp \
|
||||||
qnetworkaccessfilebackend.cpp \
|
qnetworkaccessfilebackend.cpp \
|
||||||
qnetworkaccesscachebackend.cpp \
|
qnetworkaccesscachebackend.cpp \
|
||||||
qnetworkaccessftpbackend.cpp \
|
|
||||||
qnetworkcookie.cpp \
|
qnetworkcookie.cpp \
|
||||||
qnetworkcookiejar.cpp \
|
qnetworkcookiejar.cpp \
|
||||||
qnetworkrequest.cpp \
|
qnetworkrequest.cpp \
|
||||||
qnetworkreply.cpp \
|
qnetworkreply.cpp \
|
||||||
qnetworkreplyimpl.cpp \
|
qnetworkreplyimpl.cpp \
|
||||||
qnetworkreplydataimpl.cpp \
|
qnetworkreplydataimpl.cpp \
|
||||||
qnetworkreplyhttpimpl.cpp \
|
|
||||||
qnetworkreplyfileimpl.cpp \
|
qnetworkreplyfileimpl.cpp \
|
||||||
qabstractnetworkcache.cpp \
|
qabstractnetworkcache.cpp \
|
||||||
qnetworkdiskcache.cpp \
|
|
||||||
qhttpthreaddelegate.cpp \
|
|
||||||
qhttpmultipart.cpp \
|
|
||||||
qnetworkfile.cpp \
|
qnetworkfile.cpp \
|
||||||
qhttp2protocolhandler.cpp \
|
qhsts.cpp \
|
||||||
|
qhstspolicy.cpp \
|
||||||
|
qftp.cpp \
|
||||||
|
qnetworkaccessftpbackend.cpp \
|
||||||
|
qnetworkdiskcache.cpp \
|
||||||
|
qhstsstore.cpp \
|
||||||
bitstreams.cpp \
|
bitstreams.cpp \
|
||||||
huffman.cpp \
|
huffman.cpp \
|
||||||
hpack.cpp \
|
hpack.cpp \
|
||||||
@ -51,6 +42,18 @@ QT_SOURCES += \
|
|||||||
http2frames.cpp \
|
http2frames.cpp \
|
||||||
http2streams.cpp \
|
http2streams.cpp \
|
||||||
http2protocol.cpp \
|
http2protocol.cpp \
|
||||||
|
qabstractprotocolhandler.cpp \
|
||||||
|
qhttp2protocolhandler.cpp \
|
||||||
|
qhttpmultipart.cpp \
|
||||||
|
qhttpnetworkconnection.cpp \
|
||||||
|
qhttpnetworkconnectionchannel.cpp \
|
||||||
|
qhttpnetworkheader.cpp \
|
||||||
|
qhttpnetworkreply.cpp \
|
||||||
|
qhttpnetworkrequest.cpp \
|
||||||
|
qhttpprotocolhandler.cpp \
|
||||||
|
qhttpthreaddelegate.cpp \
|
||||||
|
qnetworkreplyhttpimpl.cpp \
|
||||||
|
qspdyprotocolhandler.cpp \
|
||||||
qnetworksession.cpp \
|
qnetworksession.cpp \
|
||||||
qnetworkconfigmanager.cpp \
|
qnetworkconfigmanager.cpp \
|
||||||
qnetworkconfiguration.cpp \
|
qnetworkconfiguration.cpp \
|
||||||
@ -59,33 +62,34 @@ QT_SOURCES += \
|
|||||||
qbearerplugin.cpp \
|
qbearerplugin.cpp \
|
||||||
qsharednetworksession.cpp \
|
qsharednetworksession.cpp \
|
||||||
qauthenticator.cpp \
|
qauthenticator.cpp \
|
||||||
qdnslookup.cpp \
|
|
||||||
qhostaddress.cpp \
|
qhostaddress.cpp \
|
||||||
qhostinfo.cpp \
|
qhostinfo.cpp \
|
||||||
qnetworkdatagram.cpp \
|
qnetworkdatagram.cpp \
|
||||||
qnetworkinterface.cpp \
|
qnetworkinterface.cpp \
|
||||||
qnetworkproxy.cpp \
|
qnetworkproxy.cpp \
|
||||||
qurlinfo.cpp \
|
qurlinfo.cpp \
|
||||||
|
qdnslookup.cpp \
|
||||||
qdnslookup_unix.cpp \
|
qdnslookup_unix.cpp \
|
||||||
qhostinfo_unix.cpp \
|
qhostinfo_unix.cpp \
|
||||||
qnetworkinterface_unix.cpp \
|
qnetworkinterface_linux.cpp \
|
||||||
qnetworkproxy_generic.cpp \
|
qnetworkproxy_generic.cpp \
|
||||||
qabstractsocketengine.cpp \
|
qabstractsocketengine.cpp \
|
||||||
qhttpsocketengine.cpp \
|
|
||||||
qsocks5socketengine.cpp \
|
|
||||||
qabstractsocket.cpp \
|
qabstractsocket.cpp \
|
||||||
qtcpsocket.cpp \
|
qtcpsocket.cpp \
|
||||||
qudpsocket.cpp \
|
qudpsocket.cpp \
|
||||||
qtcpserver.cpp \
|
qtcpserver.cpp \
|
||||||
qlocalsocket.cpp \
|
qsocks5socketengine.cpp \
|
||||||
qlocalserver.cpp \
|
qhttpsocketengine.cpp \
|
||||||
qnativesocketengine.cpp \
|
qnativesocketengine.cpp \
|
||||||
qnativesocketengine_unix.cpp \
|
qnativesocketengine_unix.cpp \
|
||||||
|
qlocalsocket.cpp \
|
||||||
|
qlocalserver.cpp \
|
||||||
qlocalsocket_unix.cpp \
|
qlocalsocket_unix.cpp \
|
||||||
qlocalserver_unix.cpp \
|
qlocalserver_unix.cpp \
|
||||||
qasn1element.cpp \
|
qasn1element.cpp \
|
||||||
qssl.cpp \
|
qssl.cpp \
|
||||||
qsslcertificate.cpp \
|
qsslcertificate.cpp \
|
||||||
|
qsslcertificateextension.cpp \
|
||||||
qsslconfiguration.cpp \
|
qsslconfiguration.cpp \
|
||||||
qsslcipher.cpp \
|
qsslcipher.cpp \
|
||||||
qssldiffiehellmanparameters.cpp \
|
qssldiffiehellmanparameters.cpp \
|
||||||
@ -94,42 +98,48 @@ QT_SOURCES += \
|
|||||||
qsslerror.cpp \
|
qsslerror.cpp \
|
||||||
qsslsocket.cpp \
|
qsslsocket.cpp \
|
||||||
qsslpresharedkeyauthenticator.cpp \
|
qsslpresharedkeyauthenticator.cpp \
|
||||||
qsslcertificateextension.cpp \
|
qocspresponse.cpp \
|
||||||
qsslcertificate_openssl.cpp \
|
qdtls.cpp \
|
||||||
qsslcontext_openssl.cpp \
|
qsslsocket_openssl_symbols.cpp \
|
||||||
qssldiffiehellmanparameters_openssl.cpp \
|
qssldiffiehellmanparameters_openssl.cpp \
|
||||||
|
qsslcertificate_openssl.cpp \
|
||||||
qsslellipticcurve_openssl.cpp \
|
qsslellipticcurve_openssl.cpp \
|
||||||
qsslkey_openssl.cpp \
|
qsslkey_openssl.cpp \
|
||||||
qsslsocket_openssl.cpp \
|
qsslsocket_openssl.cpp \
|
||||||
qsslsocket_openssl_symbols.cpp \
|
qsslcontext_openssl.cpp \
|
||||||
moc_qhttpnetworkreply_p.cpp \
|
qdtls_openssl.cpp \
|
||||||
moc_qspdyprotocolhandler_p.cpp \
|
qsslsocket_opensslpre11.cpp \
|
||||||
|
qsslcontext_opensslpre11.cpp \
|
||||||
|
qpassworddigestor.cpp \
|
||||||
moc_qnetworkaccesscache_p.cpp \
|
moc_qnetworkaccesscache_p.cpp \
|
||||||
moc_qnetworkaccessbackend_p.cpp \
|
moc_qnetworkaccessbackend_p.cpp \
|
||||||
moc_qnetworkaccessdebugpipebackend_p.cpp \
|
moc_qnetworkaccessdebugpipebackend_p.cpp \
|
||||||
moc_qnetworkaccessfilebackend_p.cpp \
|
moc_qnetworkaccessfilebackend_p.cpp \
|
||||||
moc_qnetworkaccessftpbackend_p.cpp \
|
|
||||||
moc_qnetworkcookiejar.cpp \
|
moc_qnetworkcookiejar.cpp \
|
||||||
moc_qnetworkreply.cpp \
|
moc_qnetworkreply.cpp \
|
||||||
moc_qnetworkreplyhttpimpl_p.cpp \
|
|
||||||
moc_qabstractnetworkcache.cpp \
|
moc_qabstractnetworkcache.cpp \
|
||||||
moc_qnetworkdiskcache.cpp \
|
|
||||||
moc_qhttpthreaddelegate_p.cpp \
|
|
||||||
moc_qhttpmultipart.cpp \
|
|
||||||
moc_qnetworkfile_p.cpp \
|
moc_qnetworkfile_p.cpp \
|
||||||
|
moc_qnetworkaccessftpbackend_p.cpp \
|
||||||
|
moc_qnetworkdiskcache.cpp \
|
||||||
moc_qhttp2protocolhandler_p.cpp \
|
moc_qhttp2protocolhandler_p.cpp \
|
||||||
|
moc_qhttpmultipart.cpp \
|
||||||
|
moc_qhttpnetworkreply_p.cpp \
|
||||||
|
moc_qhttpthreaddelegate_p.cpp \
|
||||||
|
moc_qnetworkreplyhttpimpl_p.cpp \
|
||||||
|
moc_qspdyprotocolhandler_p.cpp \
|
||||||
moc_qnetworkconfigmanager_p.cpp \
|
moc_qnetworkconfigmanager_p.cpp \
|
||||||
moc_qnetworksession_p.cpp \
|
moc_qnetworksession_p.cpp \
|
||||||
moc_qbearerplugin_p.cpp \
|
moc_qbearerplugin_p.cpp \
|
||||||
moc_qdnslookup_p.cpp \
|
|
||||||
moc_qhostinfo_p.cpp \
|
moc_qhostinfo_p.cpp \
|
||||||
|
moc_qnetworkproxy.cpp \
|
||||||
|
moc_qdnslookup_p.cpp \
|
||||||
moc_qabstractsocketengine_p.cpp \
|
moc_qabstractsocketengine_p.cpp \
|
||||||
moc_qhttpsocketengine_p.cpp \
|
|
||||||
moc_qsocks5socketengine_p.cpp \
|
|
||||||
moc_qtcpsocket.cpp \
|
moc_qtcpsocket.cpp \
|
||||||
moc_qudpsocket.cpp \
|
moc_qudpsocket.cpp \
|
||||||
|
moc_qsocks5socketengine_p.cpp \
|
||||||
|
moc_qhttpsocketengine_p.cpp \
|
||||||
moc_qnativesocketengine_p.cpp \
|
moc_qnativesocketengine_p.cpp \
|
||||||
moc_qsslsocket_openssl_p.cpp
|
moc_qdtls.cpp
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtbase/src/network/access \
|
qtbase/src/network/access \
|
||||||
@ -146,50 +156,52 @@ QT_VPATH += \
|
|||||||
# extracted from 'compiler_moc_header_make_all' target
|
# extracted from 'compiler_moc_header_make_all' target
|
||||||
|
|
||||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||||
moc_qftp_p.cpp \
|
|
||||||
moc_qhttpnetworkreply_p.cpp \
|
|
||||||
moc_qhttpnetworkconnection_p.cpp \
|
|
||||||
moc_qhttpnetworkconnectionchannel_p.cpp \
|
|
||||||
moc_qspdyprotocolhandler_p.cpp \
|
|
||||||
moc_qnetworkaccessmanager.cpp \
|
moc_qnetworkaccessmanager.cpp \
|
||||||
moc_qnetworkaccesscache_p.cpp \
|
moc_qnetworkaccesscache_p.cpp \
|
||||||
moc_qnetworkaccessbackend_p.cpp \
|
moc_qnetworkaccessbackend_p.cpp \
|
||||||
moc_qnetworkaccessdebugpipebackend_p.cpp \
|
moc_qnetworkaccessdebugpipebackend_p.cpp \
|
||||||
moc_qnetworkaccessfilebackend_p.cpp \
|
moc_qnetworkaccessfilebackend_p.cpp \
|
||||||
moc_qnetworkaccessftpbackend_p.cpp \
|
|
||||||
moc_qnetworkcookiejar.cpp \
|
moc_qnetworkcookiejar.cpp \
|
||||||
moc_qnetworkreply.cpp \
|
moc_qnetworkreply.cpp \
|
||||||
moc_qnetworkreplyimpl_p.cpp \
|
moc_qnetworkreplyimpl_p.cpp \
|
||||||
moc_qnetworkreplydataimpl_p.cpp \
|
moc_qnetworkreplydataimpl_p.cpp \
|
||||||
moc_qnetworkreplyhttpimpl_p.cpp \
|
|
||||||
moc_qnetworkreplyfileimpl_p.cpp \
|
moc_qnetworkreplyfileimpl_p.cpp \
|
||||||
moc_qabstractnetworkcache.cpp \
|
moc_qabstractnetworkcache.cpp \
|
||||||
moc_qnetworkdiskcache.cpp \
|
|
||||||
moc_qhttpthreaddelegate_p.cpp \
|
|
||||||
moc_qhttpmultipart.cpp \
|
|
||||||
moc_qnetworkfile_p.cpp \
|
moc_qnetworkfile_p.cpp \
|
||||||
|
moc_qftp_p.cpp \
|
||||||
|
moc_qnetworkaccessftpbackend_p.cpp \
|
||||||
|
moc_qnetworkdiskcache.cpp \
|
||||||
moc_qhttp2protocolhandler_p.cpp \
|
moc_qhttp2protocolhandler_p.cpp \
|
||||||
|
moc_qhttpmultipart.cpp \
|
||||||
|
moc_qhttpnetworkconnection_p.cpp \
|
||||||
|
moc_qhttpnetworkconnectionchannel_p.cpp \
|
||||||
|
moc_qhttpnetworkreply_p.cpp \
|
||||||
|
moc_qhttpthreaddelegate_p.cpp \
|
||||||
|
moc_qnetworkreplyhttpimpl_p.cpp \
|
||||||
|
moc_qspdyprotocolhandler_p.cpp \
|
||||||
moc_qnetworksession.cpp \
|
moc_qnetworksession.cpp \
|
||||||
moc_qnetworkconfigmanager.cpp \
|
moc_qnetworkconfigmanager.cpp \
|
||||||
moc_qnetworkconfigmanager_p.cpp \
|
moc_qnetworkconfigmanager_p.cpp \
|
||||||
moc_qnetworksession_p.cpp \
|
moc_qnetworksession_p.cpp \
|
||||||
moc_qbearerengine_p.cpp \
|
moc_qbearerengine_p.cpp \
|
||||||
moc_qbearerplugin_p.cpp \
|
moc_qbearerplugin_p.cpp \
|
||||||
|
moc_qhostinfo_p.cpp \
|
||||||
|
moc_qnetworkinterface.cpp \
|
||||||
|
moc_qnetworkproxy.cpp \
|
||||||
moc_qdnslookup.cpp \
|
moc_qdnslookup.cpp \
|
||||||
moc_qdnslookup_p.cpp \
|
moc_qdnslookup_p.cpp \
|
||||||
moc_qhostinfo_p.cpp \
|
|
||||||
moc_qabstractsocketengine_p.cpp \
|
moc_qabstractsocketengine_p.cpp \
|
||||||
moc_qhttpsocketengine_p.cpp \
|
|
||||||
moc_qsocks5socketengine_p.cpp \
|
|
||||||
moc_qabstractsocket.cpp \
|
moc_qabstractsocket.cpp \
|
||||||
moc_qtcpsocket.cpp \
|
moc_qtcpsocket.cpp \
|
||||||
moc_qudpsocket.cpp \
|
moc_qudpsocket.cpp \
|
||||||
moc_qtcpserver.cpp \
|
moc_qtcpserver.cpp \
|
||||||
|
moc_qsocks5socketengine_p.cpp \
|
||||||
|
moc_qhttpsocketengine_p.cpp \
|
||||||
|
moc_qnativesocketengine_p.cpp \
|
||||||
moc_qlocalserver.cpp \
|
moc_qlocalserver.cpp \
|
||||||
moc_qlocalsocket.cpp \
|
moc_qlocalsocket.cpp \
|
||||||
moc_qnativesocketengine_p.cpp \
|
|
||||||
moc_qsslsocket.cpp \
|
moc_qsslsocket.cpp \
|
||||||
moc_qsslsocket_openssl_p.cpp
|
moc_qdtls.cpp
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
QT_DEFINES += -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/opengl \
|
qtbase/src/opengl \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtOpenGL \
|
qtbase/include/QtOpenGL \
|
||||||
qtbase/include/QtOpenGL/5.8.0 \
|
qtbase/include/QtOpenGL/5.13.0 \
|
||||||
qtbase/include/QtOpenGL/5.8.0/QtOpenGL \
|
qtbase/include/QtOpenGL/5.13.0/QtOpenGL \
|
||||||
qtbase/include/QtWidgets/5.8.0 \
|
qtbase/include/QtWidgets/5.13.0 \
|
||||||
qtbase/include/QtWidgets/5.8.0/QtWidgets \
|
qtbase/include/QtWidgets/5.13.0/QtWidgets \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
@ -26,18 +26,18 @@ QT_SOURCES += \
|
|||||||
qglpaintdevice.cpp \
|
qglpaintdevice.cpp \
|
||||||
qglbuffer.cpp \
|
qglbuffer.cpp \
|
||||||
qglshaderprogram.cpp \
|
qglshaderprogram.cpp \
|
||||||
qgraphicsshadereffect.cpp \
|
|
||||||
qglgradientcache.cpp \
|
qglgradientcache.cpp \
|
||||||
qglengineshadermanager.cpp \
|
qglengineshadermanager.cpp \
|
||||||
qgl2pexvertexarray.cpp \
|
qgl2pexvertexarray.cpp \
|
||||||
qpaintengineex_opengl2.cpp \
|
qpaintengineex_opengl2.cpp \
|
||||||
qglcustomshaderstage.cpp \
|
qglcustomshaderstage.cpp \
|
||||||
qtextureglyphcache_gl.cpp \
|
qtextureglyphcache_gl.cpp \
|
||||||
|
qgraphicsshadereffect.cpp \
|
||||||
moc_qgl.cpp \
|
moc_qgl.cpp \
|
||||||
moc_qgl_p.cpp \
|
moc_qgl_p.cpp \
|
||||||
moc_qglshaderprogram.cpp \
|
moc_qglshaderprogram.cpp \
|
||||||
moc_qgraphicsshadereffect_p.cpp \
|
moc_qglengineshadermanager_p.cpp \
|
||||||
moc_qglengineshadermanager_p.cpp
|
moc_qgraphicsshadereffect_p.cpp
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtbase/src/opengl \
|
qtbase/src/opengl \
|
||||||
@ -53,8 +53,8 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qgl.cpp \
|
moc_qgl.cpp \
|
||||||
moc_qgl_p.cpp \
|
moc_qgl_p.cpp \
|
||||||
moc_qglshaderprogram.cpp \
|
moc_qglshaderprogram.cpp \
|
||||||
moc_qgraphicsshadereffect_p.cpp \
|
moc_qglengineshadermanager_p.cpp \
|
||||||
moc_qglengineshadermanager_p.cpp
|
moc_qgraphicsshadereffect_p.cpp
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
7
repos/libports/lib/mk/qt5_pcre2.mk
Normal file
7
repos/libports/lib/mk/qt5_pcre2.mk
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
include $(call select_from_repositories,lib/import/import-qt5_pcre2.mk)
|
||||||
|
|
||||||
|
include $(REP_DIR)/lib/mk/qt5_pcre2_generated.inc
|
||||||
|
|
||||||
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
|
CC_CXX_WARN_STRICT =
|
49
repos/libports/lib/mk/qt5_pcre2_generated.inc
Normal file
49
repos/libports/lib/mk/qt5_pcre2_generated.inc
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
QT_DEFINES += -DPCRE2_CODE_UNIT_WIDTH=16 -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DHAVE_CONFIG_H -DQT_NO_DYNAMIC_CAST -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
|
||||||
|
|
||||||
|
QT_INCPATH += \
|
||||||
|
qtbase/src/3rdparty/pcre2 \
|
||||||
|
qtbase/src/3rdparty/pcre2/src \
|
||||||
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
|
QT_SOURCES += \
|
||||||
|
pcre2_auto_possess.c \
|
||||||
|
pcre2_chartables.c \
|
||||||
|
pcre2_compile.c \
|
||||||
|
pcre2_config.c \
|
||||||
|
pcre2_context.c \
|
||||||
|
pcre2_dfa_match.c \
|
||||||
|
pcre2_error.c \
|
||||||
|
pcre2_extuni.c \
|
||||||
|
pcre2_find_bracket.c \
|
||||||
|
pcre2_jit_compile.c \
|
||||||
|
pcre2_maketables.c \
|
||||||
|
pcre2_match.c \
|
||||||
|
pcre2_match_data.c \
|
||||||
|
pcre2_newline.c \
|
||||||
|
pcre2_ord2utf.c \
|
||||||
|
pcre2_pattern_info.c \
|
||||||
|
pcre2_script_run.c \
|
||||||
|
pcre2_serialize.c \
|
||||||
|
pcre2_string_utils.c \
|
||||||
|
pcre2_study.c \
|
||||||
|
pcre2_substitute.c \
|
||||||
|
pcre2_substring.c \
|
||||||
|
pcre2_tables.c \
|
||||||
|
pcre2_ucd.c \
|
||||||
|
pcre2_valid_utf.c \
|
||||||
|
pcre2_xclass.c
|
||||||
|
|
||||||
|
QT_VPATH += \
|
||||||
|
qtbase/src/3rdparty/pcre2/src \
|
||||||
|
|
||||||
|
# some source files need to be generated by moc from other source/header files before
|
||||||
|
# they get #included again by the original source file in the compiling stage
|
||||||
|
|
||||||
|
# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc)
|
||||||
|
# extracted from 'compiler_moc_header_make_all' target
|
||||||
|
|
||||||
|
|
||||||
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
|
||||||
|
|
@ -1,19 +1,20 @@
|
|||||||
QT_DEFINES += -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/printsupport \
|
qtbase/src/printsupport \
|
||||||
qtbase/src/plugins/printsupport/cups \
|
qtbase/src/printsupport/widgets \
|
||||||
qtbase/src/printsupport/dialogs \
|
qtbase/src/printsupport/dialogs \
|
||||||
|
qtbase/src/plugins/printsupport/cups \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtPrintSupport \
|
qtbase/include/QtPrintSupport \
|
||||||
qtbase/include/QtPrintSupport/5.8.0 \
|
qtbase/include/QtPrintSupport/5.13.0 \
|
||||||
qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport \
|
qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport \
|
||||||
qtbase/include/QtWidgets/5.8.0 \
|
qtbase/include/QtWidgets/5.13.0 \
|
||||||
qtbase/include/QtWidgets/5.8.0/QtWidgets \
|
qtbase/include/QtWidgets/5.13.0/QtWidgets \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
@ -21,7 +22,6 @@ QT_INCPATH += \
|
|||||||
|
|
||||||
QT_SOURCES += \
|
QT_SOURCES += \
|
||||||
qpaintengine_alpha.cpp \
|
qpaintengine_alpha.cpp \
|
||||||
qpaintengine_preview.cpp \
|
|
||||||
qprintdevice.cpp \
|
qprintdevice.cpp \
|
||||||
qprintengine_pdf.cpp \
|
qprintengine_pdf.cpp \
|
||||||
qprinter.cpp \
|
qprinter.cpp \
|
||||||
@ -29,6 +29,7 @@ QT_SOURCES += \
|
|||||||
qplatformprintdevice.cpp \
|
qplatformprintdevice.cpp \
|
||||||
qplatformprintplugin.cpp \
|
qplatformprintplugin.cpp \
|
||||||
qplatformprintersupport.cpp \
|
qplatformprintersupport.cpp \
|
||||||
|
qpaintengine_preview.cpp \
|
||||||
qprintpreviewwidget.cpp \
|
qprintpreviewwidget.cpp \
|
||||||
qprintdialog_unix.cpp \
|
qprintdialog_unix.cpp \
|
||||||
qpagesetupdialog_unix.cpp \
|
qpagesetupdialog_unix.cpp \
|
||||||
@ -57,8 +58,8 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qabstractprintdialog.cpp \
|
moc_qabstractprintdialog.cpp \
|
||||||
moc_qpagesetupdialog.cpp \
|
moc_qpagesetupdialog.cpp \
|
||||||
moc_qprintdialog.cpp \
|
moc_qprintdialog.cpp \
|
||||||
moc_qprintpreviewdialog.cpp \
|
moc_qpagesetupdialog_unix_p.cpp \
|
||||||
moc_qpagesetupdialog_unix_p.cpp
|
moc_qprintpreviewdialog.cpp
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
@ -15,7 +15,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
|
|||||||
moc_qv4profiling_p.cpp \
|
moc_qv4profiling_p.cpp \
|
||||||
|
|
||||||
|
|
||||||
QT_VPATH += qtdeclarative/src/qml/debugger
|
QT_VPATH += qtdeclarative/src/qml
|
||||||
|
|
||||||
include $(REP_DIR)/lib/mk/qt5.inc
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
|
@ -1,28 +1,30 @@
|
|||||||
QT_DEFINES += -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_NO_QML_DEBUGGER -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DQT_NO_FOREACH -DWTF_EXPORT_PRIVATE= -DJS_EXPORT_PRIVATE= -DENABLE_ASSEMBLER_WX_EXCLUSIVE=1 -DWTFReportAssertionFailure=qmlWTFReportAssertionFailure -DWTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage -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_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtdeclarative/src/qml \
|
qtdeclarative/src/qml \
|
||||||
qtdeclarative/src/qml/memory \
|
qtdeclarative/src/qml/memory \
|
||||||
qtdeclarative/src/qml/compiler \
|
qtdeclarative/src/qml/compiler \
|
||||||
|
qtdeclarative/src/qml/jsruntime \
|
||||||
|
qtdeclarative/src/qml/jit \
|
||||||
|
qtdeclarative/src/qml/debugger \
|
||||||
|
qtdeclarative/src/qml/qmldirparser \
|
||||||
|
qtdeclarative/src/qml/animations \
|
||||||
qtdeclarative/src/3rdparty/masm/jit \
|
qtdeclarative/src/3rdparty/masm/jit \
|
||||||
qtdeclarative/src/3rdparty/masm/assembler \
|
qtdeclarative/src/3rdparty/masm/assembler \
|
||||||
qtdeclarative/src/3rdparty/masm/runtime \
|
qtdeclarative/src/3rdparty/masm/runtime \
|
||||||
qtdeclarative/src/3rdparty/masm/wtf \
|
qtdeclarative/src/3rdparty/masm/wtf \
|
||||||
qtdeclarative/src/3rdparty/masm/stubs \
|
qtdeclarative/src/3rdparty/masm/stubs \
|
||||||
|
qtdeclarative/src/3rdparty/masm/stubs/runtime \
|
||||||
qtdeclarative/src/3rdparty/masm/stubs/wtf \
|
qtdeclarative/src/3rdparty/masm/stubs/wtf \
|
||||||
qtdeclarative/src/3rdparty/masm \
|
qtdeclarative/src/3rdparty/masm \
|
||||||
qtdeclarative/src/3rdparty/masm/disassembler \
|
qtdeclarative/src/3rdparty/masm/disassembler \
|
||||||
qtdeclarative/src/3rdparty/masm/disassembler/udis86 \
|
qtdeclarative/src/3rdparty/masm/disassembler/udis86 \
|
||||||
qtdeclarative/src/qml/jit \
|
|
||||||
qtdeclarative/src/qml/jsruntime \
|
|
||||||
qtdeclarative/src/qml/debugger \
|
|
||||||
qtdeclarative/src/qml/animations \
|
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtdeclarative/include/QtQml/5.8.0 \
|
qtdeclarative/include/QtQml/5.13.0 \
|
||||||
qtdeclarative/include/QtQml/5.8.0/QtQml \
|
qtdeclarative/include/QtQml/5.13.0/QtQml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
@ -32,60 +34,30 @@ QT_SOURCES += \
|
|||||||
qqmlchangeset.cpp \
|
qqmlchangeset.cpp \
|
||||||
qqmllistaccessor.cpp \
|
qqmllistaccessor.cpp \
|
||||||
qqmllistcompositor.cpp \
|
qqmllistcompositor.cpp \
|
||||||
qqmladaptormodel.cpp \
|
|
||||||
qqmlpropertymap.cpp \
|
qqmlpropertymap.cpp \
|
||||||
|
qqmladaptormodel.cpp \
|
||||||
qv4mm.cpp \
|
qv4mm.cpp \
|
||||||
qqmljsast.cpp \
|
qqmljsast.cpp \
|
||||||
qqmljsastvisitor.cpp \
|
qqmljsastvisitor.cpp \
|
||||||
qqmljsengine_p.cpp \
|
qqmljsengine_p.cpp \
|
||||||
qqmljsgrammar.cpp \
|
|
||||||
qqmljslexer.cpp \
|
qqmljslexer.cpp \
|
||||||
qqmljsparser.cpp \
|
qv4bytecodegenerator.cpp \
|
||||||
qv4compileddata.cpp \
|
qv4compileddata.cpp \
|
||||||
qv4compiler.cpp \
|
qv4compiler.cpp \
|
||||||
|
qv4compilercontext.cpp \
|
||||||
|
qv4compilerscanfunctions.cpp \
|
||||||
qv4codegen.cpp \
|
qv4codegen.cpp \
|
||||||
qv4isel_p.cpp \
|
|
||||||
qv4jsir.cpp \
|
|
||||||
qv4ssa.cpp \
|
|
||||||
qqmlirbuilder.cpp \
|
qqmlirbuilder.cpp \
|
||||||
|
qv4instr_moth.cpp \
|
||||||
|
qv4bytecodehandler.cpp \
|
||||||
qqmltypecompiler.cpp \
|
qqmltypecompiler.cpp \
|
||||||
qqmlpropertycachecreator.cpp \
|
qqmlpropertycachecreator.cpp \
|
||||||
qqmlpropertyvalidator.cpp \
|
qqmlpropertyvalidator.cpp \
|
||||||
qv4compilationunitmapper.cpp \
|
qv4compilationunitmapper.cpp \
|
||||||
qv4compilationunitmapper_unix.cpp \
|
qv4compilationunitmapper_unix.cpp \
|
||||||
qv4instr_moth.cpp \
|
|
||||||
qv4isel_moth.cpp \
|
|
||||||
qjsengine.cpp \
|
qjsengine.cpp \
|
||||||
qjsvalue.cpp \
|
qjsvalue.cpp \
|
||||||
qjsvalueiterator.cpp \
|
qjsvalueiterator.cpp \
|
||||||
qv4assembler.cpp \
|
|
||||||
qv4regalloc.cpp \
|
|
||||||
qv4isel_masm.cpp \
|
|
||||||
qv4binop.cpp \
|
|
||||||
qv4unop.cpp \
|
|
||||||
ARMv7Assembler.cpp \
|
|
||||||
LinkBuffer.cpp \
|
|
||||||
PrintStream.cpp \
|
|
||||||
FilePrintStream.cpp \
|
|
||||||
OSAllocatorPosix.cpp \
|
|
||||||
PageAllocationAligned.cpp \
|
|
||||||
PageBlock.cpp \
|
|
||||||
WTFStubs.cpp \
|
|
||||||
Options.cpp \
|
|
||||||
Disassembler.cpp \
|
|
||||||
UDis86Disassembler.cpp \
|
|
||||||
ARMv7Disassembler.cpp \
|
|
||||||
ARMv7DOpcode.cpp \
|
|
||||||
Mips32Disassembler.cpp \
|
|
||||||
Mips32Opcode.cpp \
|
|
||||||
ARM64Disassembler.cpp \
|
|
||||||
A64DOpcode.cpp \
|
|
||||||
YarrCanonicalizeUCS2.cpp \
|
|
||||||
YarrInterpreter.cpp \
|
|
||||||
YarrJIT.cpp \
|
|
||||||
YarrPattern.cpp \
|
|
||||||
YarrSyntaxChecker.cpp \
|
|
||||||
qv4engine.cpp \
|
|
||||||
qv4context.cpp \
|
qv4context.cpp \
|
||||||
qv4persistent.cpp \
|
qv4persistent.cpp \
|
||||||
qv4lookup.cpp \
|
qv4lookup.cpp \
|
||||||
@ -94,39 +66,64 @@ QT_SOURCES += \
|
|||||||
qv4managed.cpp \
|
qv4managed.cpp \
|
||||||
qv4internalclass.cpp \
|
qv4internalclass.cpp \
|
||||||
qv4sparsearray.cpp \
|
qv4sparsearray.cpp \
|
||||||
|
qv4atomics.cpp \
|
||||||
qv4arraydata.cpp \
|
qv4arraydata.cpp \
|
||||||
qv4arrayobject.cpp \
|
qv4arrayobject.cpp \
|
||||||
|
qv4arrayiterator.cpp \
|
||||||
qv4argumentsobject.cpp \
|
qv4argumentsobject.cpp \
|
||||||
qv4booleanobject.cpp \
|
qv4booleanobject.cpp \
|
||||||
qv4dateobject.cpp \
|
qv4dateobject.cpp \
|
||||||
qv4errorobject.cpp \
|
qv4errorobject.cpp \
|
||||||
qv4function.cpp \
|
qv4function.cpp \
|
||||||
qv4functionobject.cpp \
|
qv4functionobject.cpp \
|
||||||
|
qv4generatorobject.cpp \
|
||||||
qv4globalobject.cpp \
|
qv4globalobject.cpp \
|
||||||
|
qv4iterator.cpp \
|
||||||
qv4jsonobject.cpp \
|
qv4jsonobject.cpp \
|
||||||
qv4mathobject.cpp \
|
qv4mathobject.cpp \
|
||||||
qv4memberdata.cpp \
|
qv4memberdata.cpp \
|
||||||
qv4numberobject.cpp \
|
qv4numberobject.cpp \
|
||||||
qv4object.cpp \
|
qv4object.cpp \
|
||||||
qv4objectproto.cpp \
|
qv4objectproto.cpp \
|
||||||
|
qv4propertykey.cpp \
|
||||||
|
qv4proxy.cpp \
|
||||||
|
qv4qmlcontext.cpp \
|
||||||
|
qv4reflect.cpp \
|
||||||
qv4regexpobject.cpp \
|
qv4regexpobject.cpp \
|
||||||
|
qv4stackframe.cpp \
|
||||||
|
qv4stringiterator.cpp \
|
||||||
qv4stringobject.cpp \
|
qv4stringobject.cpp \
|
||||||
qv4variantobject.cpp \
|
qv4variantobject.cpp \
|
||||||
qv4objectiterator.cpp \
|
qv4objectiterator.cpp \
|
||||||
qv4regexp.cpp \
|
qv4regexp.cpp \
|
||||||
|
qv4runtimecodegen.cpp \
|
||||||
qv4serialize.cpp \
|
qv4serialize.cpp \
|
||||||
qv4script.cpp \
|
qv4script.cpp \
|
||||||
qv4executableallocator.cpp \
|
qv4symbol.cpp \
|
||||||
qv4sequenceobject.cpp \
|
qv4setobject.cpp \
|
||||||
|
qv4setiterator.cpp \
|
||||||
qv4include.cpp \
|
qv4include.cpp \
|
||||||
qv4qobjectwrapper.cpp \
|
qv4qobjectwrapper.cpp \
|
||||||
qv4arraybuffer.cpp \
|
qv4arraybuffer.cpp \
|
||||||
qv4typedarray.cpp \
|
qv4typedarray.cpp \
|
||||||
qv4dataview.cpp \
|
qv4dataview.cpp \
|
||||||
qv4vme_moth.cpp \
|
qv4vme_moth.cpp \
|
||||||
|
qv4mapobject.cpp \
|
||||||
|
qv4mapiterator.cpp \
|
||||||
|
qv4estable.cpp \
|
||||||
|
qv4module.cpp \
|
||||||
|
qv4promiseobject.cpp \
|
||||||
|
qv4sequenceobject.cpp \
|
||||||
|
qv4engine.cpp \
|
||||||
qv4runtime.cpp \
|
qv4runtime.cpp \
|
||||||
qv4string.cpp \
|
qv4string.cpp \
|
||||||
qv4value.cpp \
|
qv4value.cpp \
|
||||||
|
qv4executableallocator.cpp \
|
||||||
|
qv4functiontable_unix.cpp \
|
||||||
|
qv4jithelpers.cpp \
|
||||||
|
qv4baselinejit.cpp \
|
||||||
|
qv4baselineassembler.cpp \
|
||||||
|
qv4assemblercommon.cpp \
|
||||||
qqmlopenmetaobject.cpp \
|
qqmlopenmetaobject.cpp \
|
||||||
qqmlvmemetaobject.cpp \
|
qqmlvmemetaobject.cpp \
|
||||||
qqmlengine.cpp \
|
qqmlengine.cpp \
|
||||||
@ -146,9 +143,7 @@ QT_SOURCES += \
|
|||||||
qqmlparserstatus.cpp \
|
qqmlparserstatus.cpp \
|
||||||
qqmltypeloader.cpp \
|
qqmltypeloader.cpp \
|
||||||
qqmlinfo.cpp \
|
qqmlinfo.cpp \
|
||||||
qqmlerror.cpp \
|
|
||||||
qqmlvaluetype.cpp \
|
qqmlvaluetype.cpp \
|
||||||
qqmlxmlhttprequest.cpp \
|
|
||||||
qqmlcleanup.cpp \
|
qqmlcleanup.cpp \
|
||||||
qqmlpropertycache.cpp \
|
qqmlpropertycache.cpp \
|
||||||
qqmlnotifier.cpp \
|
qqmlnotifier.cpp \
|
||||||
@ -159,7 +154,6 @@ QT_SOURCES += \
|
|||||||
qqmlextensionplugin.cpp \
|
qqmlextensionplugin.cpp \
|
||||||
qqmlimport.cpp \
|
qqmlimport.cpp \
|
||||||
qqmllist.cpp \
|
qqmllist.cpp \
|
||||||
qqmllocale.cpp \
|
|
||||||
qqmljavascriptexpression.cpp \
|
qqmljavascriptexpression.cpp \
|
||||||
qqmlabstractbinding.cpp \
|
qqmlabstractbinding.cpp \
|
||||||
qqmlvaluetypeproxybinding.cpp \
|
qqmlvaluetypeproxybinding.cpp \
|
||||||
@ -170,14 +164,14 @@ QT_SOURCES += \
|
|||||||
qqmlabstracturlinterceptor.cpp \
|
qqmlabstracturlinterceptor.cpp \
|
||||||
qqmlapplicationengine.cpp \
|
qqmlapplicationengine.cpp \
|
||||||
qqmllistwrapper.cpp \
|
qqmllistwrapper.cpp \
|
||||||
qqmlcontextwrapper.cpp \
|
|
||||||
qqmlvaluetypewrapper.cpp \
|
qqmlvaluetypewrapper.cpp \
|
||||||
qqmltypewrapper.cpp \
|
qqmltypewrapper.cpp \
|
||||||
qqmlfileselector.cpp \
|
qqmlfileselector.cpp \
|
||||||
qqmlobjectcreator.cpp \
|
qqmlobjectcreator.cpp \
|
||||||
qqmldirparser.cpp \
|
|
||||||
qqmldelayedcallqueue.cpp \
|
qqmldelayedcallqueue.cpp \
|
||||||
qqmlloggingcategory.cpp \
|
qqmlloggingcategory.cpp \
|
||||||
|
qqmlxmlhttprequest.cpp \
|
||||||
|
qqmllocale.cpp \
|
||||||
qintrusivelist.cpp \
|
qintrusivelist.cpp \
|
||||||
qhashedstring.cpp \
|
qhashedstring.cpp \
|
||||||
qqmlthread.cpp \
|
qqmlthread.cpp \
|
||||||
@ -185,6 +179,8 @@ QT_SOURCES += \
|
|||||||
qv4domerrors.cpp \
|
qv4domerrors.cpp \
|
||||||
qv4sqlerrors.cpp \
|
qv4sqlerrors.cpp \
|
||||||
qqmlbuiltinfunctions.cpp \
|
qqmlbuiltinfunctions.cpp \
|
||||||
|
qqmldirparser.cpp \
|
||||||
|
qqmlerror.cpp \
|
||||||
qabstractanimationjob.cpp \
|
qabstractanimationjob.cpp \
|
||||||
qanimationgroupjob.cpp \
|
qanimationgroupjob.cpp \
|
||||||
qsequentialanimationgroupjob.cpp \
|
qsequentialanimationgroupjob.cpp \
|
||||||
@ -193,52 +189,54 @@ QT_SOURCES += \
|
|||||||
qpauseanimationjob.cpp \
|
qpauseanimationjob.cpp \
|
||||||
qqmlbind.cpp \
|
qqmlbind.cpp \
|
||||||
qqmlconnections.cpp \
|
qqmlconnections.cpp \
|
||||||
qqmldelegatemodel.cpp \
|
|
||||||
qqmllistmodel.cpp \
|
|
||||||
qqmllistmodelworkeragent.cpp \
|
|
||||||
qqmlmodelsmodule.cpp \
|
qqmlmodelsmodule.cpp \
|
||||||
qqmlmodelindexvaluetype.cpp \
|
qqmlmodelindexvaluetype.cpp \
|
||||||
qqmlobjectmodel.cpp \
|
qqmlobjectmodel.cpp \
|
||||||
qqmltimer.cpp \
|
|
||||||
qquickpackage.cpp \
|
qquickpackage.cpp \
|
||||||
qquickworkerscript.cpp \
|
|
||||||
qqmlinstantiator.cpp \
|
qqmlinstantiator.cpp \
|
||||||
|
qqmltableinstancemodel.cpp \
|
||||||
|
qquickworkerscript.cpp \
|
||||||
|
qqmllistmodel.cpp \
|
||||||
|
qqmllistmodelworkeragent.cpp \
|
||||||
|
qqmldelegatemodel.cpp \
|
||||||
|
qqmldelegatecomponent.cpp \
|
||||||
|
qqmltimer.cpp \
|
||||||
|
ARMv7Assembler.cpp \
|
||||||
|
LinkBuffer.cpp \
|
||||||
|
PrintStream.cpp \
|
||||||
|
FilePrintStream.cpp \
|
||||||
|
OSAllocatorPosix.cpp \
|
||||||
|
PageAllocationAligned.cpp \
|
||||||
|
PageBlock.cpp \
|
||||||
|
WTFStubs.cpp \
|
||||||
|
Options.cpp \
|
||||||
|
Disassembler.cpp \
|
||||||
|
UDis86Disassembler.cpp \
|
||||||
|
ARMv7Disassembler.cpp \
|
||||||
|
ARMv7DOpcode.cpp \
|
||||||
|
Mips32Disassembler.cpp \
|
||||||
|
Mips32Opcode.cpp \
|
||||||
|
ARM64Disassembler.cpp \
|
||||||
|
A64DOpcode.cpp \
|
||||||
|
YarrCanonicalizeUCS2.cpp \
|
||||||
|
YarrCanonicalizeUnicode.cpp \
|
||||||
|
YarrInterpreter.cpp \
|
||||||
|
YarrJIT.cpp \
|
||||||
|
YarrPattern.cpp \
|
||||||
|
YarrSyntaxChecker.cpp \
|
||||||
|
YarrUnicodeProperties.cpp qqmljsgrammar.cpp \
|
||||||
|
qqmljsparser.cpp \
|
||||||
moc_qqmlpropertymap.cpp \
|
moc_qqmlpropertymap.cpp \
|
||||||
moc_qv4debugging_p.cpp \
|
moc_qv4debugging_p.cpp \
|
||||||
moc_qv4include_p.cpp \
|
|
||||||
moc_qv4qobjectwrapper_p.cpp \
|
|
||||||
moc_qv4profiling_p.cpp \
|
moc_qv4profiling_p.cpp \
|
||||||
moc_qqmlglobal_p.cpp \
|
moc_qv4promiseobject_p.cpp \
|
||||||
moc_qqmlcomponent.cpp \
|
|
||||||
moc_qqmlengine.cpp \
|
|
||||||
moc_qqmlcontext.cpp \
|
|
||||||
moc_qqmlvaluetype_p.cpp \
|
|
||||||
moc_qqmltypenotavailable_p.cpp \
|
|
||||||
moc_qqmlextensionplugin.cpp \
|
|
||||||
moc_qqmllocale_p.cpp \
|
|
||||||
moc_qqmlcomponentattached_p.cpp \
|
moc_qqmlcomponentattached_p.cpp \
|
||||||
moc_qqmlplatform_p.cpp \
|
|
||||||
moc_qqmlfileselector.cpp \
|
|
||||||
moc_qqmldelayedcallqueue_p.cpp \
|
|
||||||
moc_qqmlloggingcategory_p.cpp \
|
|
||||||
moc_qqmldebugconnector_p.cpp \
|
moc_qqmldebugconnector_p.cpp \
|
||||||
moc_qqmldebugservice_p.cpp \
|
|
||||||
moc_qqmldebugserviceinterfaces_p.cpp \
|
moc_qqmldebugserviceinterfaces_p.cpp \
|
||||||
moc_qqmlabstractprofileradapter_p.cpp \
|
|
||||||
moc_qqmlprofiler_p.cpp \
|
moc_qqmlprofiler_p.cpp \
|
||||||
moc_qabstractanimationjob_p.cpp \
|
|
||||||
moc_qqmlbind_p.cpp \
|
|
||||||
moc_qqmlconnections_p.cpp \
|
|
||||||
moc_qqmldelegatemodel_p.cpp \
|
|
||||||
moc_qqmldelegatemodel_p_p.cpp \
|
|
||||||
moc_qqmllistmodel_p.cpp \
|
|
||||||
moc_qqmllistmodel_p_p.cpp \
|
moc_qqmllistmodel_p_p.cpp \
|
||||||
moc_qqmllistmodelworkeragent_p.cpp \
|
moc_qqmldelegatemodel_p_p.cpp \
|
||||||
moc_qqmlmodelindexvaluetype_p.cpp \
|
moc_qqmldelegatecomponent_p.cpp
|
||||||
moc_qqmlobjectmodel_p.cpp \
|
|
||||||
moc_qqmltimer_p.cpp \
|
|
||||||
moc_qquickpackage_p.cpp \
|
|
||||||
moc_qquickworkerscript_p.cpp
|
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtdeclarative/src/3rdparty/masm/assembler \
|
qtdeclarative/src/3rdparty/masm/assembler \
|
||||||
@ -247,6 +245,7 @@ QT_VPATH += \
|
|||||||
qtdeclarative/src/3rdparty/masm/disassembler/ARMv7 \
|
qtdeclarative/src/3rdparty/masm/disassembler/ARMv7 \
|
||||||
qtdeclarative/src/3rdparty/masm/disassembler/mips32 \
|
qtdeclarative/src/3rdparty/masm/disassembler/mips32 \
|
||||||
qtdeclarative/src/3rdparty/masm/stubs \
|
qtdeclarative/src/3rdparty/masm/stubs \
|
||||||
|
qtdeclarative/src/3rdparty/masm/stubs/yarr \
|
||||||
qtdeclarative/src/3rdparty/masm/wtf \
|
qtdeclarative/src/3rdparty/masm/wtf \
|
||||||
qtdeclarative/src/3rdparty/masm/yarr \
|
qtdeclarative/src/3rdparty/masm/yarr \
|
||||||
qtdeclarative/src/qml/animations \
|
qtdeclarative/src/qml/animations \
|
||||||
@ -259,6 +258,7 @@ QT_VPATH += \
|
|||||||
qtdeclarative/src/qml/qml \
|
qtdeclarative/src/qml/qml \
|
||||||
qtdeclarative/src/qml/qml/ftw \
|
qtdeclarative/src/qml/qml/ftw \
|
||||||
qtdeclarative/src/qml/qml/v8 \
|
qtdeclarative/src/qml/qml/v8 \
|
||||||
|
qtdeclarative/src/qml/qmldirparser \
|
||||||
qtdeclarative/src/qml/types \
|
qtdeclarative/src/qml/types \
|
||||||
qtdeclarative/src/qml/util \
|
qtdeclarative/src/qml/util \
|
||||||
|
|
||||||
@ -275,6 +275,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qv4include_p.cpp \
|
moc_qv4include_p.cpp \
|
||||||
moc_qv4qobjectwrapper_p.cpp \
|
moc_qv4qobjectwrapper_p.cpp \
|
||||||
moc_qv4profiling_p.cpp \
|
moc_qv4profiling_p.cpp \
|
||||||
|
moc_qv4promiseobject_p.cpp \
|
||||||
moc_qqmlglobal_p.cpp \
|
moc_qqmlglobal_p.cpp \
|
||||||
moc_qqmlcomponent.cpp \
|
moc_qqmlcomponent.cpp \
|
||||||
moc_qqmlengine.cpp \
|
moc_qqmlengine.cpp \
|
||||||
@ -283,32 +284,32 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qqmlvaluetype_p.cpp \
|
moc_qqmlvaluetype_p.cpp \
|
||||||
moc_qqmltypenotavailable_p.cpp \
|
moc_qqmltypenotavailable_p.cpp \
|
||||||
moc_qqmlextensionplugin.cpp \
|
moc_qqmlextensionplugin.cpp \
|
||||||
moc_qqmllocale_p.cpp \
|
|
||||||
moc_qqmlcomponentattached_p.cpp \
|
moc_qqmlcomponentattached_p.cpp \
|
||||||
moc_qqmlplatform_p.cpp \
|
moc_qqmlplatform_p.cpp \
|
||||||
moc_qqmlapplicationengine.cpp \
|
moc_qqmlapplicationengine.cpp \
|
||||||
moc_qqmlfileselector.cpp \
|
moc_qqmlfileselector.cpp \
|
||||||
moc_qqmldelayedcallqueue_p.cpp \
|
moc_qqmldelayedcallqueue_p.cpp \
|
||||||
moc_qqmlloggingcategory_p.cpp \
|
moc_qqmlloggingcategory_p.cpp \
|
||||||
|
moc_qqmllocale_p.cpp \
|
||||||
moc_qqmldebugconnector_p.cpp \
|
moc_qqmldebugconnector_p.cpp \
|
||||||
moc_qqmldebugservice_p.cpp \
|
|
||||||
moc_qqmldebugserviceinterfaces_p.cpp \
|
moc_qqmldebugserviceinterfaces_p.cpp \
|
||||||
moc_qqmlabstractprofileradapter_p.cpp \
|
|
||||||
moc_qqmlprofiler_p.cpp \
|
moc_qqmlprofiler_p.cpp \
|
||||||
moc_qabstractanimationjob_p.cpp \
|
moc_qabstractanimationjob_p.cpp \
|
||||||
moc_qqmlbind_p.cpp \
|
moc_qqmlbind_p.cpp \
|
||||||
moc_qqmlconnections_p.cpp \
|
moc_qqmlconnections_p.cpp \
|
||||||
moc_qqmldelegatemodel_p.cpp \
|
moc_qqmlmodelindexvaluetype_p.cpp \
|
||||||
moc_qqmldelegatemodel_p_p.cpp \
|
moc_qqmlobjectmodel_p.cpp \
|
||||||
|
moc_qquickpackage_p.cpp \
|
||||||
|
moc_qqmlinstantiator_p.cpp \
|
||||||
|
moc_qqmltableinstancemodel_p.cpp \
|
||||||
|
moc_qquickworkerscript_p.cpp \
|
||||||
moc_qqmllistmodel_p.cpp \
|
moc_qqmllistmodel_p.cpp \
|
||||||
moc_qqmllistmodel_p_p.cpp \
|
moc_qqmllistmodel_p_p.cpp \
|
||||||
moc_qqmllistmodelworkeragent_p.cpp \
|
moc_qqmllistmodelworkeragent_p.cpp \
|
||||||
moc_qqmlmodelindexvaluetype_p.cpp \
|
moc_qqmldelegatemodel_p.cpp \
|
||||||
moc_qqmlobjectmodel_p.cpp \
|
moc_qqmldelegatemodel_p_p.cpp \
|
||||||
moc_qqmltimer_p.cpp \
|
moc_qqmldelegatecomponent_p.cpp \
|
||||||
moc_qquickpackage_p.cpp \
|
moc_qqmltimer_p.cpp
|
||||||
moc_qquickworkerscript_p.cpp \
|
|
||||||
moc_qqmlinstantiator_p.cpp
|
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
@ -316,7 +317,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||||
qqmladaptormodel.moc \
|
qqmladaptormodel.moc \
|
||||||
qqmltypeloader.moc \
|
qqmltypeloader.moc \
|
||||||
qqmlxmlhttprequest.moc \
|
|
||||||
qqmlfile.moc \
|
qqmlfile.moc \
|
||||||
|
qqmlxmlhttprequest.moc \
|
||||||
qquickworkerscript.moc
|
qquickworkerscript.moc
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
QT_DEFINES += -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtdeclarative/src/imports/folderlistmodel \
|
qtdeclarative/src/imports/folderlistmodel \
|
||||||
qtdeclarative/include/QtQml/5.8.0 \
|
qtdeclarative/include/QtQml/5.13.0 \
|
||||||
qtdeclarative/include/QtQml/5.8.0/QtQml \
|
qtdeclarative/include/QtQml/5.13.0/QtQml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
|
@ -4,8 +4,8 @@ SHARED_LIB = yes
|
|||||||
|
|
||||||
SRC_CC = qgenericunixeventdispatcher.cpp \
|
SRC_CC = qgenericunixeventdispatcher.cpp \
|
||||||
qunixeventdispatcher.cpp \
|
qunixeventdispatcher.cpp \
|
||||||
qbasicfontdatabase.cpp \
|
|
||||||
qfontengine_ft.cpp \
|
qfontengine_ft.cpp \
|
||||||
|
qfreetypefontdatabase.cpp \
|
||||||
qeglconvenience.cpp \
|
qeglconvenience.cpp \
|
||||||
moc_qunixeventdispatcher_qpa_p.cpp
|
moc_qunixeventdispatcher_qpa_p.cpp
|
||||||
|
|
||||||
@ -48,8 +48,7 @@ LIBS += qt5_gui qt5_core qoost egl freetype libc
|
|||||||
|
|
||||||
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eglconvenience
|
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eglconvenience
|
||||||
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eventdispatchers
|
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eventdispatchers
|
||||||
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/basic
|
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/freetype
|
||||||
vpath % $(QT5_CONTRIB_DIR)/qtbase/src/gui/text
|
|
||||||
vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker
|
vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
QT_DEFINES += -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtdeclarative/src/imports/layouts \
|
qtdeclarative/src/imports/layouts \
|
||||||
qtdeclarative/include/QtQuick/5.8.0 \
|
qtdeclarative/include/QtQuick/5.13.0 \
|
||||||
qtdeclarative/include/QtQuick/5.8.0/QtQuick \
|
qtdeclarative/include/QtQuick/5.13.0/QtQuick \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQuick \
|
qtdeclarative/include/QtQuick \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtdeclarative/include/QtQml/5.8.0 \
|
qtdeclarative/include/QtQml/5.13.0 \
|
||||||
qtdeclarative/include/QtQml/5.8.0/QtQml \
|
qtdeclarative/include/QtQml/5.13.0/QtQml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
@ -26,9 +26,7 @@ QT_SOURCES += \
|
|||||||
qquickstacklayout.cpp \
|
qquickstacklayout.cpp \
|
||||||
qquickgridlayoutengine.cpp \
|
qquickgridlayoutengine.cpp \
|
||||||
qquicklayoutstyleinfo.cpp \
|
qquicklayoutstyleinfo.cpp \
|
||||||
moc_qquicklayout_p.cpp \
|
moc_qquicklayout_p.cpp
|
||||||
moc_qquicklinearlayout_p.cpp \
|
|
||||||
moc_qquickstacklayout_p.cpp
|
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtdeclarative/src/imports/layouts \
|
qtdeclarative/src/imports/layouts \
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
QT_DEFINES += -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtdeclarative/src/imports/qtquick2 \
|
qtdeclarative/src/imports/qtquick2 \
|
||||||
qtdeclarative/include/QtQuick/5.8.0 \
|
qtdeclarative/include/QtQuick/5.13.0 \
|
||||||
qtdeclarative/include/QtQuick/5.8.0/QtQuick \
|
qtdeclarative/include/QtQuick/5.13.0/QtQuick \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQuick \
|
qtdeclarative/include/QtQuick \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtdeclarative/include/QtQml/5.8.0 \
|
qtdeclarative/include/QtQml/5.13.0 \
|
||||||
qtdeclarative/include/QtQml/5.8.0/QtQml \
|
qtdeclarative/include/QtQml/5.13.0/QtQml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
|
@ -10,7 +10,7 @@ QT_DEFINES += -UQT_STATICPLUGIN
|
|||||||
|
|
||||||
include $(REP_DIR)/lib/mk/qt5.inc
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_svg
|
LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_svg qt5_virtualkeyboard
|
||||||
|
|
||||||
# install the Qt plugin
|
# install the Qt plugin
|
||||||
|
|
||||||
|
@ -1,66 +1,31 @@
|
|||||||
QT_DEFINES += -DQT_VIRTUALKEYBOARD_DEFAULT_STYLE=\"default\" -DQT_VIRTUALKEYBOARD_DESKTOP -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_DEPRECATED_WARNINGS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtvirtualkeyboard/src/virtualkeyboard \
|
qtvirtualkeyboard/src/plugin \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \
|
||||||
|
qtbase/include/QtGui/5.13.0 \
|
||||||
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
|
qtvirtualkeyboard/include \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQuick \
|
qtdeclarative/include/QtQuick \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
QT_SOURCES += \
|
QT_SOURCES += \
|
||||||
platforminputcontext.cpp \
|
|
||||||
inputcontext.cpp \
|
|
||||||
abstractinputmethod.cpp \
|
|
||||||
plaininputmethod.cpp \
|
|
||||||
inputengine.cpp \
|
|
||||||
shifthandler.cpp \
|
|
||||||
plugin.cpp \
|
plugin.cpp \
|
||||||
inputmethod.cpp \
|
extensionloader.cpp \
|
||||||
selectionlistmodel.cpp \
|
moc_plugin.cpp
|
||||||
defaultinputmethod.cpp \
|
|
||||||
abstractinputpanel.cpp \
|
|
||||||
enterkeyaction.cpp \
|
|
||||||
enterkeyactionattachedtype.cpp \
|
|
||||||
settings.cpp \
|
|
||||||
virtualkeyboardsettings.cpp \
|
|
||||||
trace.cpp \
|
|
||||||
desktopinputpanel.cpp \
|
|
||||||
inputview.cpp \
|
|
||||||
appinputpanel.cpp \
|
|
||||||
qrc_default_style.cpp \
|
|
||||||
qrc_retro_style.cpp \
|
|
||||||
qrc_content.cpp \
|
|
||||||
qrc_layouts.cpp \
|
|
||||||
moc_platforminputcontext.cpp \
|
|
||||||
moc_inputcontext.cpp \
|
|
||||||
moc_abstractinputmethod.cpp \
|
|
||||||
moc_plaininputmethod.cpp \
|
|
||||||
moc_inputengine.cpp \
|
|
||||||
moc_shifthandler.cpp \
|
|
||||||
moc_inputmethod.cpp \
|
|
||||||
moc_selectionlistmodel.cpp \
|
|
||||||
moc_defaultinputmethod.cpp \
|
|
||||||
moc_abstractinputpanel.cpp \
|
|
||||||
moc_enterkeyaction.cpp \
|
|
||||||
moc_enterkeyactionattachedtype.cpp \
|
|
||||||
moc_settings.cpp \
|
|
||||||
moc_virtualkeyboardsettings.cpp \
|
|
||||||
moc_plugin.cpp \
|
|
||||||
moc_trace.cpp \
|
|
||||||
moc_desktopinputpanel.cpp \
|
|
||||||
moc_inputview.cpp \
|
|
||||||
moc_appinputpanel.cpp
|
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtvirtualkeyboard/src/virtualkeyboard \
|
qtvirtualkeyboard/src/plugin \
|
||||||
|
|
||||||
# some source files need to be generated by moc from other source/header files before
|
# some source files need to be generated by moc from other source/header files before
|
||||||
# they get #included again by the original source file in the compiling stage
|
# they get #included again by the original source file in the compiling stage
|
||||||
@ -69,25 +34,7 @@ QT_VPATH += \
|
|||||||
# extracted from 'compiler_moc_header_make_all' target
|
# extracted from 'compiler_moc_header_make_all' target
|
||||||
|
|
||||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||||
moc_platforminputcontext.cpp \
|
moc_plugin.cpp
|
||||||
moc_inputcontext.cpp \
|
|
||||||
moc_abstractinputmethod.cpp \
|
|
||||||
moc_plaininputmethod.cpp \
|
|
||||||
moc_inputengine.cpp \
|
|
||||||
moc_shifthandler.cpp \
|
|
||||||
moc_inputmethod.cpp \
|
|
||||||
moc_selectionlistmodel.cpp \
|
|
||||||
moc_defaultinputmethod.cpp \
|
|
||||||
moc_abstractinputpanel.cpp \
|
|
||||||
moc_enterkeyaction.cpp \
|
|
||||||
moc_enterkeyactionattachedtype.cpp \
|
|
||||||
moc_settings.cpp \
|
|
||||||
moc_virtualkeyboardsettings.cpp \
|
|
||||||
moc_plugin.cpp \
|
|
||||||
moc_trace.cpp \
|
|
||||||
moc_desktopinputpanel.cpp \
|
|
||||||
moc_inputview.cpp \
|
|
||||||
moc_appinputpanel.cpp
|
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
@ -10,7 +10,7 @@ QT_DEFINES += -UQT_STATICPLUGIN
|
|||||||
|
|
||||||
include $(REP_DIR)/lib/mk/qt5.inc
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
LIBS += qt5_gui qt5_qml qt5_quick qt5_svg
|
LIBS += qt5_gui qt5_qml qt5_quick qt5_svg qt5_virtualkeyboard
|
||||||
|
|
||||||
# install the QML plugin
|
# install the QML plugin
|
||||||
|
|
||||||
|
@ -1,27 +1,35 @@
|
|||||||
QT_DEFINES += -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtvirtualkeyboard/src/virtualkeyboard/styles \
|
qtvirtualkeyboard/src/styles \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \
|
||||||
|
qtvirtualkeyboard/include \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQuick \
|
qtdeclarative/include/QtQuick \
|
||||||
qtsvg/include \
|
qtsvg/include \
|
||||||
qtsvg/include/QtSvg \
|
qtsvg/include/QtSvg \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
|
qtbase/include/QtGui/5.13.0 \
|
||||||
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
|
qtbase/include/QtCore/5.13.0 \
|
||||||
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
QT_SOURCES += \
|
QT_SOURCES += \
|
||||||
svgimageprovider.cpp \
|
svgimageprovider.cpp \
|
||||||
styles_plugin.cpp \
|
qtquickvirtualkeyboardstylesplugin.cpp \
|
||||||
qrc_styles.cpp \
|
qrc_styles.cpp \
|
||||||
moc_styles_plugin.cpp
|
moc_qtquickvirtualkeyboardstylesplugin.cpp
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtvirtualkeyboard/src/virtualkeyboard/styles \
|
qtvirtualkeyboard/src/styles \
|
||||||
|
|
||||||
# some source files need to be generated by moc from other source/header files before
|
# some source files need to be generated by moc from other source/header files before
|
||||||
# they get #included again by the original source file in the compiling stage
|
# they get #included again by the original source file in the compiling stage
|
||||||
@ -30,7 +38,7 @@ QT_VPATH += \
|
|||||||
# extracted from 'compiler_moc_header_make_all' target
|
# extracted from 'compiler_moc_header_make_all' target
|
||||||
|
|
||||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||||
moc_styles_plugin.cpp
|
moc_qtquickvirtualkeyboardstylesplugin.cpp
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DQT_BUILD_QUICK_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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QUICK_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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtdeclarative/src/quick \
|
qtdeclarative/src/quick \
|
||||||
qtdeclarative/src/quick \
|
qtdeclarative/src/quick \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQuick \
|
qtdeclarative/include/QtQuick \
|
||||||
qtdeclarative/include/QtQuick/5.8.0 \
|
qtdeclarative/include/QtQuick/5.13.0 \
|
||||||
qtdeclarative/include/QtQuick/5.8.0/QtQuick \
|
qtdeclarative/include/QtQuick/5.13.0/QtQuick \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtdeclarative/include/QtQml/5.8.0 \
|
qtdeclarative/include/QtQml/5.13.0 \
|
||||||
qtdeclarative/include/QtQml/5.8.0/QtQml \
|
qtdeclarative/include/QtQml/5.13.0/QtQml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
@ -48,8 +48,8 @@ QT_SOURCES += \
|
|||||||
qquickanimatorcontroller.cpp \
|
qquickanimatorcontroller.cpp \
|
||||||
qquickfontmetrics.cpp \
|
qquickfontmetrics.cpp \
|
||||||
qquicktextmetrics.cpp \
|
qquicktextmetrics.cpp \
|
||||||
qquickshortcut.cpp \
|
|
||||||
qquickvalidator.cpp \
|
qquickvalidator.cpp \
|
||||||
|
qquickshortcut.cpp \
|
||||||
qquickpath.cpp \
|
qquickpath.cpp \
|
||||||
qquickpathinterpolator.cpp \
|
qquickpathinterpolator.cpp \
|
||||||
qsgabstractrenderer.cpp \
|
qsgabstractrenderer.cpp \
|
||||||
@ -68,7 +68,6 @@ QT_SOURCES += \
|
|||||||
qsgsimpletexturenode.cpp \
|
qsgsimpletexturenode.cpp \
|
||||||
qsgtexture.cpp \
|
qsgtexture.cpp \
|
||||||
qsgtextureprovider.cpp \
|
qsgtextureprovider.cpp \
|
||||||
qsgdistancefieldutil.cpp \
|
|
||||||
qsgflatcolormaterial.cpp \
|
qsgflatcolormaterial.cpp \
|
||||||
qsgsimplematerial.cpp \
|
qsgsimplematerial.cpp \
|
||||||
qsgtexturematerial.cpp \
|
qsgtexturematerial.cpp \
|
||||||
@ -100,8 +99,8 @@ QT_SOURCES += \
|
|||||||
qsgdefaultimagenode.cpp \
|
qsgdefaultimagenode.cpp \
|
||||||
qsgdefaultninepatchnode.cpp \
|
qsgdefaultninepatchnode.cpp \
|
||||||
qsgdefaultlayer.cpp \
|
qsgdefaultlayer.cpp \
|
||||||
qsgthreadedrenderloop.cpp \
|
|
||||||
qsgwindowsrenderloop.cpp \
|
qsgwindowsrenderloop.cpp \
|
||||||
|
qsgthreadedrenderloop.cpp \
|
||||||
qsgdefaultspritenode.cpp \
|
qsgdefaultspritenode.cpp \
|
||||||
qsgsoftwarecontext.cpp \
|
qsgsoftwarecontext.cpp \
|
||||||
qsgabstractsoftwarerenderer.cpp \
|
qsgabstractsoftwarerenderer.cpp \
|
||||||
@ -119,8 +118,11 @@ QT_SOURCES += \
|
|||||||
qsgsoftwarerenderloop.cpp \
|
qsgsoftwarerenderloop.cpp \
|
||||||
qsgsoftwarelayer.cpp \
|
qsgsoftwarelayer.cpp \
|
||||||
qsgsoftwareadaptation.cpp \
|
qsgsoftwareadaptation.cpp \
|
||||||
qsgsoftwarethreadedrenderloop.cpp \
|
|
||||||
qsgsoftwarespritenode.cpp \
|
qsgsoftwarespritenode.cpp \
|
||||||
|
qsgsoftwarethreadedrenderloop.cpp \
|
||||||
|
qsgtexturereader.cpp \
|
||||||
|
qsgcompressedatlastexture.cpp \
|
||||||
|
qsgcompressedtexture.cpp \
|
||||||
qquickevents.cpp \
|
qquickevents.cpp \
|
||||||
qquickanchors.cpp \
|
qquickanchors.cpp \
|
||||||
qquickitem.cpp \
|
qquickitem.cpp \
|
||||||
@ -144,7 +146,6 @@ QT_SOURCES += \
|
|||||||
qquickmousearea.cpp \
|
qquickmousearea.cpp \
|
||||||
qquickpincharea.cpp \
|
qquickpincharea.cpp \
|
||||||
qquickflickable.cpp \
|
qquickflickable.cpp \
|
||||||
qquickrepeater.cpp \
|
|
||||||
qquickloader.cpp \
|
qquickloader.cpp \
|
||||||
qquicktranslate.cpp \
|
qquicktranslate.cpp \
|
||||||
qquickclipnode.cpp \
|
qquickclipnode.cpp \
|
||||||
@ -164,12 +165,15 @@ QT_SOURCES += \
|
|||||||
qquickitemgrabresult.cpp \
|
qquickitemgrabresult.cpp \
|
||||||
qquickanimatedimage.cpp \
|
qquickanimatedimage.cpp \
|
||||||
qquickgridview.cpp \
|
qquickgridview.cpp \
|
||||||
|
qquickitemviewfxitem.cpp \
|
||||||
qquickitemview.cpp \
|
qquickitemview.cpp \
|
||||||
qquickitemviewtransition.cpp \
|
qquickitemviewtransition.cpp \
|
||||||
qquicklistview.cpp \
|
qquicklistview.cpp \
|
||||||
|
qquicktableview.cpp \
|
||||||
qquickpathview.cpp \
|
qquickpathview.cpp \
|
||||||
qquickpositioners.cpp \
|
qquickpositioners.cpp \
|
||||||
qquickflipable.cpp \
|
qquickflipable.cpp \
|
||||||
|
qquickrepeater.cpp \
|
||||||
qquickshadereffectsource.cpp \
|
qquickshadereffectsource.cpp \
|
||||||
qquickshadereffectmesh.cpp \
|
qquickshadereffectmesh.cpp \
|
||||||
qquickshadereffect.cpp \
|
qquickshadereffect.cpp \
|
||||||
@ -188,6 +192,17 @@ QT_SOURCES += \
|
|||||||
qquickcontext2dtile.cpp \
|
qquickcontext2dtile.cpp \
|
||||||
qquickcontext2dtexture.cpp \
|
qquickcontext2dtexture.cpp \
|
||||||
qquickcontext2dcommandbuffer.cpp \
|
qquickcontext2dcommandbuffer.cpp \
|
||||||
|
qquickdraghandler.cpp \
|
||||||
|
qquickhandlerpoint.cpp \
|
||||||
|
qquickhoverhandler.cpp \
|
||||||
|
qquickmultipointhandler.cpp \
|
||||||
|
qquickpinchhandler.cpp \
|
||||||
|
qquickpointerdevicehandler.cpp \
|
||||||
|
qquickpointerhandler.cpp \
|
||||||
|
qquickpointhandler.cpp \
|
||||||
|
qquicksinglepointhandler.cpp \
|
||||||
|
qquicktaphandler.cpp \
|
||||||
|
qquickdragaxis.cpp \
|
||||||
qquickdesignercustomobjectdata.cpp \
|
qquickdesignercustomobjectdata.cpp \
|
||||||
qquickdesignersupport.cpp \
|
qquickdesignersupport.cpp \
|
||||||
qquickdesignersupportitems.cpp \
|
qquickdesignersupportitems.cpp \
|
||||||
@ -201,122 +216,37 @@ QT_SOURCES += \
|
|||||||
qtquick2.cpp \
|
qtquick2.cpp \
|
||||||
qrc_scenegraph.cpp \
|
qrc_scenegraph.cpp \
|
||||||
qrc_items.cpp \
|
qrc_items.cpp \
|
||||||
moc_qquickapplication_p.cpp \
|
|
||||||
moc_qquickanimation_p.cpp \
|
|
||||||
moc_qquicksystempalette_p.cpp \
|
|
||||||
moc_qquickspringanimation_p.cpp \
|
|
||||||
moc_qquickanimationcontroller_p.cpp \
|
|
||||||
moc_qquicksmoothedanimation_p.cpp \
|
|
||||||
moc_qquicksmoothedanimation_p_p.cpp \
|
moc_qquicksmoothedanimation_p_p.cpp \
|
||||||
moc_qquickstate_p.cpp \
|
|
||||||
moc_qquickpropertychanges_p.cpp \
|
|
||||||
moc_qquickstategroup_p.cpp \
|
|
||||||
moc_qquicktransition_p.cpp \
|
|
||||||
moc_qquicktimeline_p_p.cpp \
|
moc_qquicktimeline_p_p.cpp \
|
||||||
moc_qquickpixmapcache_p.cpp \
|
|
||||||
moc_qquickbehavior_p.cpp \
|
|
||||||
moc_qquickfontloader_p.cpp \
|
|
||||||
moc_qquickimageprovider.cpp \
|
|
||||||
moc_qquickvaluetypes_p.cpp \
|
|
||||||
moc_qquickanimator_p.cpp \
|
|
||||||
moc_qquickanimatorjob_p.cpp \
|
|
||||||
moc_qquickanimatorcontroller_p.cpp \
|
|
||||||
moc_qquickprofiler_p.cpp \
|
moc_qquickprofiler_p.cpp \
|
||||||
moc_qquickfontmetrics_p.cpp \
|
moc_qsgcompressedatlastexture_p.cpp \
|
||||||
moc_qquicktextmetrics_p.cpp \
|
moc_qsgcompressedtexture_p.cpp \
|
||||||
moc_qquickshortcut_p.cpp \
|
|
||||||
moc_qquickvalidator_p.cpp \
|
|
||||||
moc_qquickpath_p.cpp \
|
|
||||||
moc_qquickpathinterpolator_p.cpp \
|
|
||||||
moc_qsgabstractrenderer.cpp \
|
|
||||||
moc_qsgbatchrenderer_p.cpp \
|
|
||||||
moc_qsgengine.cpp \
|
|
||||||
moc_qsgtexture.cpp \
|
|
||||||
moc_qsgtexture_p.cpp \
|
|
||||||
moc_qsgtextureprovider.cpp \
|
|
||||||
moc_qsgatlastexture_p.cpp \
|
|
||||||
moc_qsgadaptationlayer_p.cpp \
|
|
||||||
moc_qsgcontext_p.cpp \
|
|
||||||
moc_qsgcontextplugin_p.cpp \
|
|
||||||
moc_qsgrenderloop_p.cpp \
|
|
||||||
moc_qsgdefaultrendercontext_p.cpp \
|
|
||||||
moc_qsgdefaultlayer_p.cpp \
|
|
||||||
moc_qsgthreadedrenderloop_p.cpp \
|
|
||||||
moc_qsgwindowsrenderloop_p.cpp \
|
|
||||||
moc_qsgsoftwarecontext_p.cpp \
|
|
||||||
moc_qsgsoftwarepixmaptexture_p.cpp \
|
|
||||||
moc_qsgsoftwarerenderloop_p.cpp \
|
|
||||||
moc_qsgsoftwarelayer_p.cpp \
|
|
||||||
moc_qsgsoftwarethreadedrenderloop_p.cpp \
|
|
||||||
moc_qquickevents_p_p.cpp \
|
moc_qquickevents_p_p.cpp \
|
||||||
moc_qquickaccessibleattached_p.cpp \
|
|
||||||
moc_qquickitem_p.cpp \
|
|
||||||
moc_qquickrectangle_p.cpp \
|
|
||||||
moc_qquickwindow_p.cpp \
|
|
||||||
moc_qquickfocusscope_p.cpp \
|
|
||||||
moc_qquickpainteditem.cpp \
|
|
||||||
moc_qquicktext_p.cpp \
|
|
||||||
moc_qquicktextinput_p.cpp \
|
|
||||||
moc_qquicktextdocument.cpp \
|
|
||||||
moc_qquicktextdocument_p.cpp \
|
|
||||||
moc_qquicktextedit_p.cpp \
|
|
||||||
moc_qquicktextutil_p.cpp \
|
|
||||||
moc_qquickimagebase_p.cpp \
|
|
||||||
moc_qquickimage_p.cpp \
|
moc_qquickimage_p.cpp \
|
||||||
moc_qquickborderimage_p.cpp \
|
moc_qquickimage_p_p.cpp \
|
||||||
moc_qquickscalegrid_p_p.cpp \
|
moc_qquickscalegrid_p_p.cpp \
|
||||||
moc_qquickmousearea_p.cpp \
|
|
||||||
moc_qquickpincharea_p.cpp \
|
|
||||||
moc_qquickflickable_p.cpp \
|
|
||||||
moc_qquickflickable_p_p.cpp \
|
moc_qquickflickable_p_p.cpp \
|
||||||
moc_qquickrepeater_p.cpp \
|
moc_qquickdraghandler_p.cpp \
|
||||||
moc_qquicktranslate_p.cpp \
|
moc_qquickhandlerpoint_p.cpp \
|
||||||
moc_qquickview.cpp \
|
moc_qquickhoverhandler_p.cpp \
|
||||||
moc_qquickitemanimation_p.cpp \
|
moc_qquickmultipointhandler_p.cpp \
|
||||||
moc_qquickimplicitsizeitem_p.cpp \
|
moc_qquickpinchhandler_p.cpp \
|
||||||
moc_qquickdrag_p.cpp \
|
moc_qquickpointerdevicehandler_p.cpp \
|
||||||
moc_qquickdroparea_p.cpp \
|
moc_qquickpointerhandler_p.cpp \
|
||||||
moc_qquickmultipointtoucharea_p.cpp \
|
moc_qquickpointhandler_p.cpp \
|
||||||
moc_qquickscreen_p.cpp \
|
moc_qquicksinglepointhandler_p.cpp \
|
||||||
moc_qquickwindowattached_p.cpp \
|
moc_qquicktaphandler_p.cpp \
|
||||||
moc_qquickwindowmodule_p.cpp \
|
moc_qquickdragaxis_p.cpp
|
||||||
moc_qquickrendercontrol.cpp \
|
|
||||||
moc_qquickgraphicsinfo_p.cpp \
|
|
||||||
moc_qquickitemgrabresult.cpp \
|
|
||||||
moc_qquickanimatedimage_p.cpp \
|
|
||||||
moc_qquickgridview_p.cpp \
|
|
||||||
moc_qquickitemview_p.cpp \
|
|
||||||
moc_qquickitemviewtransition_p.cpp \
|
|
||||||
moc_qquicklistview_p.cpp \
|
|
||||||
moc_qquickpathview_p.cpp \
|
|
||||||
moc_qquickpositioners_p.cpp \
|
|
||||||
moc_qquickflipable_p.cpp \
|
|
||||||
moc_qquickshadereffectsource_p.cpp \
|
|
||||||
moc_qquickshadereffectmesh_p.cpp \
|
|
||||||
moc_qquickshadereffect_p.cpp \
|
|
||||||
moc_qquickgenericshadereffect_p.cpp \
|
|
||||||
moc_qquickopenglshadereffect_p.cpp \
|
|
||||||
moc_qquickopenglshadereffectnode_p.cpp \
|
|
||||||
moc_qquickspriteengine_p.cpp \
|
|
||||||
moc_qquicksprite_p.cpp \
|
|
||||||
moc_qquickspritesequence_p.cpp \
|
|
||||||
moc_qquickanimatedsprite_p.cpp \
|
|
||||||
moc_qquickopenglinfo_p.cpp \
|
|
||||||
moc_qquickframebufferobject.cpp \
|
|
||||||
moc_qquickcanvasitem_p.cpp \
|
|
||||||
moc_qquickcanvascontext_p.cpp \
|
|
||||||
moc_qquickcontext2d_p.cpp \
|
|
||||||
moc_qquickcontext2dtexture_p.cpp \
|
|
||||||
moc_qquickdesignerwindowmanager_p.cpp \
|
|
||||||
moc_qquickdesignercustomparserobject_p.cpp
|
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtdeclarative/src/quick \
|
qtdeclarative/src/quick \
|
||||||
qtdeclarative/src/quick/designer \
|
qtdeclarative/src/quick/designer \
|
||||||
|
qtdeclarative/src/quick/handlers \
|
||||||
qtdeclarative/src/quick/items \
|
qtdeclarative/src/quick/items \
|
||||||
qtdeclarative/src/quick/items/context2d \
|
qtdeclarative/src/quick/items/context2d \
|
||||||
qtdeclarative/src/quick/scenegraph \
|
qtdeclarative/src/quick/scenegraph \
|
||||||
qtdeclarative/src/quick/scenegraph/adaptations/software \
|
qtdeclarative/src/quick/scenegraph/adaptations/software \
|
||||||
|
qtdeclarative/src/quick/scenegraph/compressedtexture \
|
||||||
qtdeclarative/src/quick/scenegraph/coreapi \
|
qtdeclarative/src/quick/scenegraph/coreapi \
|
||||||
qtdeclarative/src/quick/scenegraph/util \
|
qtdeclarative/src/quick/scenegraph/util \
|
||||||
qtdeclarative/src/quick/util \
|
qtdeclarative/src/quick/util \
|
||||||
@ -352,8 +282,8 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qquickprofiler_p.cpp \
|
moc_qquickprofiler_p.cpp \
|
||||||
moc_qquickfontmetrics_p.cpp \
|
moc_qquickfontmetrics_p.cpp \
|
||||||
moc_qquicktextmetrics_p.cpp \
|
moc_qquicktextmetrics_p.cpp \
|
||||||
moc_qquickshortcut_p.cpp \
|
|
||||||
moc_qquickvalidator_p.cpp \
|
moc_qquickvalidator_p.cpp \
|
||||||
|
moc_qquickshortcut_p.cpp \
|
||||||
moc_qquickpath_p.cpp \
|
moc_qquickpath_p.cpp \
|
||||||
moc_qquickpathinterpolator_p.cpp \
|
moc_qquickpathinterpolator_p.cpp \
|
||||||
moc_qsgabstractrenderer.cpp \
|
moc_qsgabstractrenderer.cpp \
|
||||||
@ -369,13 +299,15 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qsgrenderloop_p.cpp \
|
moc_qsgrenderloop_p.cpp \
|
||||||
moc_qsgdefaultrendercontext_p.cpp \
|
moc_qsgdefaultrendercontext_p.cpp \
|
||||||
moc_qsgdefaultlayer_p.cpp \
|
moc_qsgdefaultlayer_p.cpp \
|
||||||
moc_qsgthreadedrenderloop_p.cpp \
|
|
||||||
moc_qsgwindowsrenderloop_p.cpp \
|
moc_qsgwindowsrenderloop_p.cpp \
|
||||||
|
moc_qsgthreadedrenderloop_p.cpp \
|
||||||
moc_qsgsoftwarecontext_p.cpp \
|
moc_qsgsoftwarecontext_p.cpp \
|
||||||
moc_qsgsoftwarepixmaptexture_p.cpp \
|
moc_qsgsoftwarepixmaptexture_p.cpp \
|
||||||
moc_qsgsoftwarerenderloop_p.cpp \
|
moc_qsgsoftwarerenderloop_p.cpp \
|
||||||
moc_qsgsoftwarelayer_p.cpp \
|
moc_qsgsoftwarelayer_p.cpp \
|
||||||
moc_qsgsoftwarethreadedrenderloop_p.cpp \
|
moc_qsgsoftwarethreadedrenderloop_p.cpp \
|
||||||
|
moc_qsgcompressedatlastexture_p.cpp \
|
||||||
|
moc_qsgcompressedtexture_p.cpp \
|
||||||
moc_qquickevents_p_p.cpp \
|
moc_qquickevents_p_p.cpp \
|
||||||
moc_qquickanchors_p.cpp \
|
moc_qquickanchors_p.cpp \
|
||||||
moc_qquickaccessibleattached_p.cpp \
|
moc_qquickaccessibleattached_p.cpp \
|
||||||
@ -395,13 +327,13 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qquicktextutil_p.cpp \
|
moc_qquicktextutil_p.cpp \
|
||||||
moc_qquickimagebase_p.cpp \
|
moc_qquickimagebase_p.cpp \
|
||||||
moc_qquickimage_p.cpp \
|
moc_qquickimage_p.cpp \
|
||||||
|
moc_qquickimage_p_p.cpp \
|
||||||
moc_qquickborderimage_p.cpp \
|
moc_qquickborderimage_p.cpp \
|
||||||
moc_qquickscalegrid_p_p.cpp \
|
moc_qquickscalegrid_p_p.cpp \
|
||||||
moc_qquickmousearea_p.cpp \
|
moc_qquickmousearea_p.cpp \
|
||||||
moc_qquickpincharea_p.cpp \
|
moc_qquickpincharea_p.cpp \
|
||||||
moc_qquickflickable_p.cpp \
|
moc_qquickflickable_p.cpp \
|
||||||
moc_qquickflickable_p_p.cpp \
|
moc_qquickflickable_p_p.cpp \
|
||||||
moc_qquickrepeater_p.cpp \
|
|
||||||
moc_qquickloader_p.cpp \
|
moc_qquickloader_p.cpp \
|
||||||
moc_qquicktranslate_p.cpp \
|
moc_qquicktranslate_p.cpp \
|
||||||
moc_qquickview.cpp \
|
moc_qquickview.cpp \
|
||||||
@ -422,9 +354,11 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qquickitemview_p.cpp \
|
moc_qquickitemview_p.cpp \
|
||||||
moc_qquickitemviewtransition_p.cpp \
|
moc_qquickitemviewtransition_p.cpp \
|
||||||
moc_qquicklistview_p.cpp \
|
moc_qquicklistview_p.cpp \
|
||||||
|
moc_qquicktableview_p.cpp \
|
||||||
moc_qquickpathview_p.cpp \
|
moc_qquickpathview_p.cpp \
|
||||||
moc_qquickpositioners_p.cpp \
|
moc_qquickpositioners_p.cpp \
|
||||||
moc_qquickflipable_p.cpp \
|
moc_qquickflipable_p.cpp \
|
||||||
|
moc_qquickrepeater_p.cpp \
|
||||||
moc_qquickshadereffectsource_p.cpp \
|
moc_qquickshadereffectsource_p.cpp \
|
||||||
moc_qquickshadereffectmesh_p.cpp \
|
moc_qquickshadereffectmesh_p.cpp \
|
||||||
moc_qquickshadereffect_p.cpp \
|
moc_qquickshadereffect_p.cpp \
|
||||||
@ -441,6 +375,17 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qquickcanvascontext_p.cpp \
|
moc_qquickcanvascontext_p.cpp \
|
||||||
moc_qquickcontext2d_p.cpp \
|
moc_qquickcontext2d_p.cpp \
|
||||||
moc_qquickcontext2dtexture_p.cpp \
|
moc_qquickcontext2dtexture_p.cpp \
|
||||||
|
moc_qquickdraghandler_p.cpp \
|
||||||
|
moc_qquickhandlerpoint_p.cpp \
|
||||||
|
moc_qquickhoverhandler_p.cpp \
|
||||||
|
moc_qquickmultipointhandler_p.cpp \
|
||||||
|
moc_qquickpinchhandler_p.cpp \
|
||||||
|
moc_qquickpointerdevicehandler_p.cpp \
|
||||||
|
moc_qquickpointerhandler_p.cpp \
|
||||||
|
moc_qquickpointhandler_p.cpp \
|
||||||
|
moc_qquicksinglepointhandler_p.cpp \
|
||||||
|
moc_qquicktaphandler_p.cpp \
|
||||||
|
moc_qquickdragaxis_p.cpp \
|
||||||
moc_qquickdesignerwindowmanager_p.cpp \
|
moc_qquickdesignerwindowmanager_p.cpp \
|
||||||
moc_qquickdesignercustomparserobject_p.cpp
|
moc_qquickdesignercustomparserobject_p.cpp
|
||||||
|
|
||||||
@ -455,7 +400,6 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
|||||||
qsgthreadedrenderloop.moc \
|
qsgthreadedrenderloop.moc \
|
||||||
qsgsoftwarethreadedrenderloop.moc \
|
qsgsoftwarethreadedrenderloop.moc \
|
||||||
qquickwindow.moc \
|
qquickwindow.moc \
|
||||||
qquickimage.moc \
|
|
||||||
qquickflipable.moc \
|
qquickflipable.moc \
|
||||||
qquickshadereffectsource.moc \
|
qquickshadereffectsource.moc \
|
||||||
qquickopenglshadereffectnode.moc \
|
qquickopenglshadereffectnode.moc \
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
QT_DEFINES += -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/sql \
|
qtbase/src/sql \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtSql \
|
qtbase/include/QtSql \
|
||||||
qtbase/include/QtSql/5.8.0 \
|
qtbase/include/QtSql/5.13.0 \
|
||||||
qtbase/include/QtSql/5.8.0/QtSql \
|
qtbase/include/QtSql/5.13.0/QtSql \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_USING_NAMESPACE -DQT_BUILD_SVG_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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_USING_NAMESPACE -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_SVG_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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtsvg/src/svg \
|
qtsvg/src/svg \
|
||||||
qtsvg/include \
|
qtsvg/include \
|
||||||
qtsvg/include/QtSvg \
|
qtsvg/include/QtSvg \
|
||||||
qtsvg/include/QtSvg/5.8.0 \
|
qtsvg/include/QtSvg/5.13.0 \
|
||||||
qtsvg/include/QtSvg/5.8.0/QtSvg \
|
qtsvg/include/QtSvg/5.13.0/QtSvg \
|
||||||
qtbase/include/QtWidgets/5.8.0 \
|
qtbase/include/QtWidgets/5.13.0 \
|
||||||
qtbase/include/QtWidgets/5.8.0/QtWidgets \
|
qtbase/include/QtWidgets/5.13.0/QtWidgets \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_NO_DATASTREAM -DQT_BUILD_TESTLIB_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_NO_DATASTREAM -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_TESTLIB_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/testlib \
|
qtbase/src/testlib \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtTest \
|
qtbase/include/QtTest \
|
||||||
qtbase/include/QtTest/5.8.0 \
|
qtbase/include/QtTest/5.13.0 \
|
||||||
qtbase/include/QtTest/5.8.0/QtTest \
|
qtbase/include/QtTest/5.13.0/QtTest \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
@ -36,7 +36,10 @@ QT_SOURCES += \
|
|||||||
qtestxunitstreamer.cpp \
|
qtestxunitstreamer.cpp \
|
||||||
qxunittestlogger.cpp \
|
qxunittestlogger.cpp \
|
||||||
qtestblacklist.cpp \
|
qtestblacklist.cpp \
|
||||||
moc_qtesteventloop.cpp
|
qtaptestlogger.cpp \
|
||||||
|
qabstractitemmodeltester.cpp \
|
||||||
|
moc_qtesteventloop.cpp \
|
||||||
|
moc_qabstractitemmodeltester.cpp
|
||||||
|
|
||||||
QT_VPATH += \
|
QT_VPATH += \
|
||||||
qtbase/src/testlib \
|
qtbase/src/testlib \
|
||||||
@ -48,7 +51,8 @@ QT_VPATH += \
|
|||||||
# extracted from 'compiler_moc_header_make_all' target
|
# extracted from 'compiler_moc_header_make_all' target
|
||||||
|
|
||||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||||
moc_qtesteventloop.cpp
|
moc_qtesteventloop.cpp \
|
||||||
|
moc_qabstractitemmodeltester.cpp
|
||||||
|
|
||||||
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
# extracted from 'compiler_moc_source_make_all' rule
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
QT_DEFINES += -DQT_DESIGNER -DQT_USE_QSTRINGBUILDER -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_BUILD_UITOOLS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UIPLUGIN_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_DESIGNER -DQT_USE_QSTRINGBUILDER -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_UITOOLS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UIPLUGIN_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qttools/src/designer/src/uitools \
|
qttools/src/designer/src/uitools \
|
||||||
qttools/src/designer/src/lib/uilib \
|
qttools/src/designer/src/lib/uilib \
|
||||||
qttools/include \
|
qttools/include \
|
||||||
qttools/include/QtUiTools \
|
qttools/include/QtUiTools \
|
||||||
qttools/include/QtUiTools/5.8.0 \
|
qttools/include/QtUiTools/5.13.0 \
|
||||||
qttools/include/QtUiTools/5.8.0/QtUiTools \
|
qttools/include/QtUiTools/5.13.0/QtUiTools \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
|
15
repos/libports/lib/mk/qt5_virtualkeyboard.mk
Normal file
15
repos/libports/lib/mk/qt5_virtualkeyboard.mk
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
include $(call select_from_repositories,lib/import/import-qt5_virtualkeyboard.mk)
|
||||||
|
|
||||||
|
SHARED_LIB = yes
|
||||||
|
|
||||||
|
include $(REP_DIR)/lib/mk/qt5_virtualkeyboard_generated.inc
|
||||||
|
|
||||||
|
QT_VPATH += qtvirtualkeyboard/src/virtualkeyboard/content \
|
||||||
|
qtvirtualkeyboard/src/virtualkeyboard/content/styles/default \
|
||||||
|
qtvirtualkeyboard/src/virtualkeyboard/content/styles/retro
|
||||||
|
|
||||||
|
include $(REP_DIR)/lib/mk/qt5.inc
|
||||||
|
|
||||||
|
LIBS += qt5_core qt5_gui qt5_network qt5_qml qt5_quick
|
||||||
|
|
||||||
|
CC_CXX_WARN_STRICT =
|
119
repos/libports/lib/mk/qt5_virtualkeyboard_generated.inc
Normal file
119
repos/libports/lib/mk/qt5_virtualkeyboard_generated.inc
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
QT_DEFINES += -DQVIRTUALKEYBOARD_LIBRARY -DQT_VIRTUALKEYBOARD_DEFAULT_STYLE=\"default\" -DQT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR=\"qrc:/QtQuick/VirtualKeyboard/content/layouts\" -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_VIRTUALKEYBOARD_DESKTOP -DHAVE_LAYOUTS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_VIRTUALKEYBOARD_LIB -DQT_BUILDING_QT -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
|
QT_INCPATH += \
|
||||||
|
qtvirtualkeyboard/src/virtualkeyboard \
|
||||||
|
qtvirtualkeyboard/include \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \
|
||||||
|
qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \
|
||||||
|
qtdeclarative/include \
|
||||||
|
qtdeclarative/include/QtQuick \
|
||||||
|
qtbase/include/QtGui/5.13.0 \
|
||||||
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
|
qtbase/include \
|
||||||
|
qtbase/include/QtGui \
|
||||||
|
qtdeclarative/include/QtQml \
|
||||||
|
qtbase/include/QtNetwork \
|
||||||
|
qtbase/include/QtCore/5.13.0 \
|
||||||
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
|
qtbase/include/QtCore \
|
||||||
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
|
QT_SOURCES += \
|
||||||
|
platforminputcontext.cpp \
|
||||||
|
qvirtualkeyboardinputcontext.cpp \
|
||||||
|
qvirtualkeyboardinputcontext_p.cpp \
|
||||||
|
qvirtualkeyboardabstractinputmethod.cpp \
|
||||||
|
plaininputmethod.cpp \
|
||||||
|
qvirtualkeyboardinputengine.cpp \
|
||||||
|
shifthandler.cpp \
|
||||||
|
inputmethod.cpp \
|
||||||
|
inputselectionhandle.cpp \
|
||||||
|
qvirtualkeyboardselectionlistmodel.cpp \
|
||||||
|
fallbackinputmethod.cpp \
|
||||||
|
abstractinputpanel.cpp \
|
||||||
|
appinputpanel.cpp \
|
||||||
|
enterkeyaction.cpp \
|
||||||
|
enterkeyactionattachedtype.cpp \
|
||||||
|
settings.cpp \
|
||||||
|
virtualkeyboardsettings.cpp \
|
||||||
|
qvirtualkeyboardtrace.cpp \
|
||||||
|
desktopinputselectioncontrol.cpp \
|
||||||
|
shadowinputcontext.cpp \
|
||||||
|
gesturerecognizer.cpp \
|
||||||
|
handwritinggesturerecognizer.cpp \
|
||||||
|
qvirtualkeyboardextensionplugin.cpp \
|
||||||
|
desktopinputpanel.cpp \
|
||||||
|
inputview.cpp \
|
||||||
|
qrc_virtualkeyboard_default_style.cpp \
|
||||||
|
qrc_virtualkeyboard_retro_style.cpp \
|
||||||
|
qrc_virtualkeyboard_content.cpp \
|
||||||
|
qrc_qmake_virtualkeyboard_layouts.cpp \
|
||||||
|
moc_platforminputcontext_p.cpp \
|
||||||
|
moc_qvirtualkeyboardinputcontext.cpp \
|
||||||
|
moc_qvirtualkeyboardinputcontext_p.cpp \
|
||||||
|
moc_qvirtualkeyboardabstractinputmethod.cpp \
|
||||||
|
moc_plaininputmethod_p.cpp \
|
||||||
|
moc_qvirtualkeyboardinputengine.cpp \
|
||||||
|
moc_shifthandler_p.cpp \
|
||||||
|
moc_inputmethod_p.cpp \
|
||||||
|
moc_inputselectionhandle_p.cpp \
|
||||||
|
moc_qvirtualkeyboardselectionlistmodel.cpp \
|
||||||
|
moc_fallbackinputmethod_p.cpp \
|
||||||
|
moc_abstractinputpanel_p.cpp \
|
||||||
|
moc_appinputpanel_p.cpp \
|
||||||
|
moc_enterkeyaction_p.cpp \
|
||||||
|
moc_enterkeyactionattachedtype_p.cpp \
|
||||||
|
moc_settings_p.cpp \
|
||||||
|
moc_virtualkeyboardsettings_p.cpp \
|
||||||
|
moc_qvirtualkeyboardtrace.cpp \
|
||||||
|
moc_desktopinputselectioncontrol_p.cpp \
|
||||||
|
moc_shadowinputcontext_p.cpp \
|
||||||
|
moc_gesturerecognizer_p.cpp \
|
||||||
|
moc_handwritinggesturerecognizer_p.cpp \
|
||||||
|
moc_qvirtualkeyboardextensionplugin.cpp \
|
||||||
|
moc_desktopinputpanel_p.cpp \
|
||||||
|
moc_inputview_p.cpp
|
||||||
|
|
||||||
|
QT_VPATH += \
|
||||||
|
qtvirtualkeyboard/src/virtualkeyboard \
|
||||||
|
|
||||||
|
# some source files need to be generated by moc from other source/header files before
|
||||||
|
# they get #included again by the original source file in the compiling stage
|
||||||
|
|
||||||
|
# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc)
|
||||||
|
# extracted from 'compiler_moc_header_make_all' target
|
||||||
|
|
||||||
|
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||||
|
moc_platforminputcontext_p.cpp \
|
||||||
|
moc_qvirtualkeyboardinputcontext.cpp \
|
||||||
|
moc_qvirtualkeyboardinputcontext_p.cpp \
|
||||||
|
moc_qvirtualkeyboardabstractinputmethod.cpp \
|
||||||
|
moc_plaininputmethod_p.cpp \
|
||||||
|
moc_qvirtualkeyboardinputengine.cpp \
|
||||||
|
moc_shifthandler_p.cpp \
|
||||||
|
moc_inputmethod_p.cpp \
|
||||||
|
moc_inputselectionhandle_p.cpp \
|
||||||
|
moc_qvirtualkeyboardselectionlistmodel.cpp \
|
||||||
|
moc_fallbackinputmethod_p.cpp \
|
||||||
|
moc_abstractinputpanel_p.cpp \
|
||||||
|
moc_appinputpanel_p.cpp \
|
||||||
|
moc_enterkeyaction_p.cpp \
|
||||||
|
moc_enterkeyactionattachedtype_p.cpp \
|
||||||
|
moc_settings_p.cpp \
|
||||||
|
moc_virtualkeyboardsettings_p.cpp \
|
||||||
|
moc_qvirtualkeyboardtrace.cpp \
|
||||||
|
moc_desktopinputselectioncontrol_p.cpp \
|
||||||
|
moc_shadowinputcontext_p.cpp \
|
||||||
|
moc_gesturerecognizer_p.cpp \
|
||||||
|
moc_handwritinggesturerecognizer_p.cpp \
|
||||||
|
moc_qvirtualkeyboardextensionplugin.cpp \
|
||||||
|
moc_desktopinputpanel_p.cpp \
|
||||||
|
moc_inputview_p.cpp
|
||||||
|
|
||||||
|
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
|
||||||
|
# extracted from 'compiler_moc_source_make_all' rule
|
||||||
|
|
||||||
|
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSTATICALLY_LINKED_WITH_ANGLE -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_WebCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSTATICALLY_LINKED_WITH_ANGLE -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_WebCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtwebkit/Source/WebCore \
|
qtwebkit/Source/WebCore \
|
||||||
@ -124,14 +124,14 @@ QT_INCPATH += \
|
|||||||
qtwebkit/Source/JavaScriptCore/ForwardingHeaders \
|
qtwebkit/Source/JavaScriptCore/ForwardingHeaders \
|
||||||
qtwebkit/Source/JavaScriptCore/disassembler/udis86 \
|
qtwebkit/Source/JavaScriptCore/disassembler/udis86 \
|
||||||
qtwebkit/Source/WTF \
|
qtwebkit/Source/WTF \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtSql \
|
qtbase/include/QtSql \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DQT_BUILD_WEBKIT_LIB -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DSTATICALLY_LINKED_WITH_WebCore -DSTATICALLY_LINKED_WITH_ANGLE -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_WebKit1 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_BUILD_WEBKIT_LIB -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DSTATICALLY_LINKED_WITH_WebCore -DSTATICALLY_LINKED_WITH_ANGLE -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_WebKit1 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtwebkit/Source/WebKit \
|
qtwebkit/Source/WebKit \
|
||||||
@ -125,14 +125,14 @@ QT_INCPATH += \
|
|||||||
qtwebkit/Source/JavaScriptCore/ForwardingHeaders \
|
qtwebkit/Source/JavaScriptCore/ForwardingHeaders \
|
||||||
qtwebkit/Source/JavaScriptCore/disassembler/udis86 \
|
qtwebkit/Source/JavaScriptCore/disassembler/udis86 \
|
||||||
qtwebkit/Source/WTF \
|
qtwebkit/Source/WTF \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtSql \
|
qtbase/include/QtSql \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DQT_BUILD_WEBKITWIDGETS_LIB -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DQT_BUILD_WEBKITWIDGETS_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 -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_PRINTSUPPORT_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_BUILD_WEBKITWIDGETS_LIB -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_WEBKITWIDGETS_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 -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_PRINTSUPPORT_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtwebkit/Source \
|
qtwebkit/Source \
|
||||||
@ -105,6 +105,7 @@ QT_INCPATH += \
|
|||||||
qtwebkit/Source/WebCore/bindings/js \
|
qtwebkit/Source/WebCore/bindings/js \
|
||||||
qtwebkit/Source/WebCore/bridge/c \
|
qtwebkit/Source/WebCore/bridge/c \
|
||||||
qtwebkit/Source/WebCore/testing/js \
|
qtwebkit/Source/WebCore/testing/js \
|
||||||
|
qtbase/src/3rdparty/sqlite \
|
||||||
qtwebkit/Source/JavaScriptCore \
|
qtwebkit/Source/JavaScriptCore \
|
||||||
qtwebkit/Source \
|
qtwebkit/Source \
|
||||||
qtwebkit/Source/WTF \
|
qtwebkit/Source/WTF \
|
||||||
@ -127,25 +128,20 @@ QT_INCPATH += \
|
|||||||
qtwebkit/Source/JavaScriptCore/ForwardingHeaders \
|
qtwebkit/Source/JavaScriptCore/ForwardingHeaders \
|
||||||
qtwebkit/Source/JavaScriptCore/disassembler/udis86 \
|
qtwebkit/Source/JavaScriptCore/disassembler/udis86 \
|
||||||
qtwebkit/Source/WTF \
|
qtwebkit/Source/WTF \
|
||||||
qtwebkit/include \
|
|
||||||
qtwebkit/include/QtWebKitWidgets \
|
|
||||||
qtwebkit/include/QtWebKitWidgets/5.8.0 \
|
|
||||||
qtwebkit/include/QtWebKitWidgets/5.8.0/QtWebKitWidgets \
|
|
||||||
qtwebkit/Source/qt/Api \
|
qtwebkit/Source/qt/Api \
|
||||||
qtwebkit/Source/qt/WebCoreSupport \
|
qtwebkit/Source/qt/WebCoreSupport \
|
||||||
qtwebkit/Source \
|
qtwebkit/Source \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
qtwebkit/include/QtWebKit \
|
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/include/QtWidgets/5.8.0 \
|
qtbase/include/QtWidgets/5.13.0 \
|
||||||
qtbase/include/QtWidgets/5.8.0/QtWidgets \
|
qtbase/include/QtWidgets/5.13.0/QtWidgets \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtPrintSupport \
|
qtbase/include/QtPrintSupport \
|
||||||
qtbase/include/QtOpenGL \
|
qtbase/include/QtOpenGL \
|
||||||
qtbase/include/QtSql \
|
qtbase/include/QtSql \
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_STYLE_MAC -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/widgets \
|
qtbase/src/widgets \
|
||||||
qtbase/src/widgets/dialogs \
|
qtbase/src/widgets/dialogs \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtWidgets \
|
qtbase/include/QtWidgets \
|
||||||
qtbase/include/QtWidgets/5.8.0 \
|
qtbase/include/QtWidgets/5.13.0 \
|
||||||
qtbase/include/QtWidgets/5.8.0/QtWidgets \
|
qtbase/include/QtWidgets/5.13.0/QtWidgets \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
@ -21,7 +21,6 @@ QT_SOURCES += \
|
|||||||
qapplication.cpp \
|
qapplication.cpp \
|
||||||
qwidgetbackingstore.cpp \
|
qwidgetbackingstore.cpp \
|
||||||
qboxlayout.cpp \
|
qboxlayout.cpp \
|
||||||
qformlayout.cpp \
|
|
||||||
qgridlayout.cpp \
|
qgridlayout.cpp \
|
||||||
qlayout.cpp \
|
qlayout.cpp \
|
||||||
qlayoutengine.cpp \
|
qlayoutengine.cpp \
|
||||||
@ -30,7 +29,6 @@ QT_SOURCES += \
|
|||||||
qsizepolicy.cpp \
|
qsizepolicy.cpp \
|
||||||
qstackedlayout.cpp \
|
qstackedlayout.cpp \
|
||||||
qtooltip.cpp \
|
qtooltip.cpp \
|
||||||
qwhatsthis.cpp \
|
|
||||||
qwidget.cpp \
|
qwidget.cpp \
|
||||||
qwidgetaction.cpp \
|
qwidgetaction.cpp \
|
||||||
qgesture.cpp \
|
qgesture.cpp \
|
||||||
@ -41,10 +39,12 @@ QT_SOURCES += \
|
|||||||
qwidgetsvariant.cpp \
|
qwidgetsvariant.cpp \
|
||||||
qwidgetwindow.cpp \
|
qwidgetwindow.cpp \
|
||||||
qwindowcontainer.cpp \
|
qwindowcontainer.cpp \
|
||||||
|
qtestsupport_widgets.cpp \
|
||||||
qopenglwidget.cpp \
|
qopenglwidget.cpp \
|
||||||
|
qformlayout.cpp \
|
||||||
|
qwhatsthis.cpp \
|
||||||
qdrawutil.cpp \
|
qdrawutil.cpp \
|
||||||
qstyle.cpp \
|
qstyle.cpp \
|
||||||
qstyleanimation.cpp \
|
|
||||||
qstylefactory.cpp \
|
qstylefactory.cpp \
|
||||||
qstyleoption.cpp \
|
qstyleoption.cpp \
|
||||||
qstyleplugin.cpp \
|
qstyleplugin.cpp \
|
||||||
@ -55,30 +55,33 @@ QT_SOURCES += \
|
|||||||
qstylesheetstyle.cpp \
|
qstylesheetstyle.cpp \
|
||||||
qstylesheetstyle_default.cpp \
|
qstylesheetstyle_default.cpp \
|
||||||
qpixmapstyle.cpp \
|
qpixmapstyle.cpp \
|
||||||
|
qstyleanimation.cpp \
|
||||||
qwindowsstyle.cpp \
|
qwindowsstyle.cpp \
|
||||||
qfusionstyle.cpp \
|
qfusionstyle.cpp \
|
||||||
qbuttongroup.cpp \
|
qframe.cpp \
|
||||||
|
qabstractscrollarea.cpp \
|
||||||
|
qfocusframe.cpp \
|
||||||
|
qwidgetanimator.cpp \
|
||||||
qabstractbutton.cpp \
|
qabstractbutton.cpp \
|
||||||
qabstractslider.cpp \
|
qabstractslider.cpp \
|
||||||
qabstractspinbox.cpp \
|
qbuttongroup.cpp \
|
||||||
qcalendarwidget.cpp \
|
qcalendarwidget.cpp \
|
||||||
qcheckbox.cpp \
|
qcheckbox.cpp \
|
||||||
qcombobox.cpp \
|
qcombobox.cpp \
|
||||||
qcommandlinkbutton.cpp \
|
qcommandlinkbutton.cpp \
|
||||||
qdatetimeedit.cpp \
|
qdatetimeedit.cpp \
|
||||||
qdial.cpp \
|
qdial.cpp \
|
||||||
qdialogbuttonbox.cpp \
|
|
||||||
qdockwidget.cpp \
|
qdockwidget.cpp \
|
||||||
qdockarealayout.cpp \
|
qdockarealayout.cpp \
|
||||||
qeffects.cpp \
|
qeffects.cpp \
|
||||||
qfontcombobox.cpp \
|
qfontcombobox.cpp \
|
||||||
qframe.cpp \
|
|
||||||
qgroupbox.cpp \
|
qgroupbox.cpp \
|
||||||
qkeysequenceedit.cpp \
|
qkeysequenceedit.cpp \
|
||||||
qlabel.cpp \
|
qlabel.cpp \
|
||||||
qlcdnumber.cpp \
|
qlcdnumber.cpp \
|
||||||
qlineedit_p.cpp \
|
qlineedit_p.cpp \
|
||||||
qlineedit.cpp \
|
qlineedit.cpp \
|
||||||
|
qwidgetlinecontrol.cpp \
|
||||||
qmainwindow.cpp \
|
qmainwindow.cpp \
|
||||||
qmainwindowlayout.cpp \
|
qmainwindowlayout.cpp \
|
||||||
qmdiarea.cpp \
|
qmdiarea.cpp \
|
||||||
@ -88,65 +91,63 @@ QT_SOURCES += \
|
|||||||
qprogressbar.cpp \
|
qprogressbar.cpp \
|
||||||
qpushbutton.cpp \
|
qpushbutton.cpp \
|
||||||
qradiobutton.cpp \
|
qradiobutton.cpp \
|
||||||
|
qwidgetresizehandler.cpp \
|
||||||
|
qdialogbuttonbox.cpp \
|
||||||
qrubberband.cpp \
|
qrubberband.cpp \
|
||||||
|
qscrollarea.cpp \
|
||||||
qscrollbar.cpp \
|
qscrollbar.cpp \
|
||||||
qsizegrip.cpp \
|
qsizegrip.cpp \
|
||||||
qslider.cpp \
|
qslider.cpp \
|
||||||
|
qabstractspinbox.cpp \
|
||||||
qspinbox.cpp \
|
qspinbox.cpp \
|
||||||
qsplashscreen.cpp \
|
qsplashscreen.cpp \
|
||||||
qsplitter.cpp \
|
qsplitter.cpp \
|
||||||
qstackedwidget.cpp \
|
qstackedwidget.cpp \
|
||||||
qstatusbar.cpp \
|
qstatusbar.cpp \
|
||||||
qtabbar.cpp \
|
qtabbar.cpp \
|
||||||
qtabwidget.cpp \
|
qplaintextedit.cpp \
|
||||||
qtextedit.cpp \
|
qtextedit.cpp \
|
||||||
qtextbrowser.cpp \
|
qtextbrowser.cpp \
|
||||||
|
qtabwidget.cpp \
|
||||||
qtoolbar.cpp \
|
qtoolbar.cpp \
|
||||||
qtoolbarlayout.cpp \
|
qtoolbarlayout.cpp \
|
||||||
qtoolbarextension.cpp \
|
qtoolbararealayout.cpp \
|
||||||
qtoolbarseparator.cpp \
|
qtoolbarseparator.cpp \
|
||||||
qtoolbox.cpp \
|
qtoolbox.cpp \
|
||||||
qtoolbutton.cpp \
|
qtoolbutton.cpp \
|
||||||
qabstractscrollarea.cpp \
|
qtoolbarextension.cpp \
|
||||||
qwidgetresizehandler.cpp \
|
|
||||||
qfocusframe.cpp \
|
|
||||||
qscrollarea.cpp \
|
|
||||||
qwidgetanimator.cpp \
|
|
||||||
qwidgettextcontrol.cpp \
|
qwidgettextcontrol.cpp \
|
||||||
qwidgetlinecontrol.cpp \
|
|
||||||
qtoolbararealayout.cpp \
|
|
||||||
qplaintextedit.cpp \
|
|
||||||
qcolordialog.cpp \
|
qcolordialog.cpp \
|
||||||
qdialog.cpp \
|
qdialog.cpp \
|
||||||
qerrormessage.cpp \
|
qerrormessage.cpp \
|
||||||
qfiledialog.cpp \
|
qfiledialog.cpp \
|
||||||
|
qsidebar.cpp \
|
||||||
|
qfilesystemmodel.cpp \
|
||||||
|
qfileinfogatherer.cpp \
|
||||||
qfontdialog.cpp \
|
qfontdialog.cpp \
|
||||||
qinputdialog.cpp \
|
qinputdialog.cpp \
|
||||||
qmessagebox.cpp \
|
qmessagebox.cpp \
|
||||||
qprogressdialog.cpp \
|
qprogressdialog.cpp \
|
||||||
qsidebar.cpp \
|
|
||||||
qfilesystemmodel.cpp \
|
|
||||||
qfileinfogatherer.cpp \
|
|
||||||
qwizard.cpp \
|
qwizard.cpp \
|
||||||
qabstractitemview.cpp \
|
qabstractitemview.cpp \
|
||||||
qheaderview.cpp \
|
qheaderview.cpp \
|
||||||
qlistview.cpp \
|
|
||||||
qbsptree.cpp \
|
qbsptree.cpp \
|
||||||
qtableview.cpp \
|
|
||||||
qtreeview.cpp \
|
|
||||||
qabstractitemdelegate.cpp \
|
qabstractitemdelegate.cpp \
|
||||||
qitemdelegate.cpp \
|
qitemdelegate.cpp \
|
||||||
qdirmodel.cpp \
|
|
||||||
qlistwidget.cpp \
|
|
||||||
qtablewidget.cpp \
|
|
||||||
qtreewidget.cpp \
|
|
||||||
qitemeditorfactory.cpp \
|
qitemeditorfactory.cpp \
|
||||||
qtreewidgetitemiterator.cpp \
|
qstyleditemdelegate.cpp \
|
||||||
qdatawidgetmapper.cpp \
|
|
||||||
qfileiconprovider.cpp \
|
|
||||||
qcolumnview.cpp \
|
qcolumnview.cpp \
|
||||||
qcolumnviewgrip.cpp \
|
qcolumnviewgrip.cpp \
|
||||||
qstyleditemdelegate.cpp \
|
qdatawidgetmapper.cpp \
|
||||||
|
qdirmodel.cpp \
|
||||||
|
qlistview.cpp \
|
||||||
|
qlistwidget.cpp \
|
||||||
|
qtableview.cpp \
|
||||||
|
qtablewidget.cpp \
|
||||||
|
qtreeview.cpp \
|
||||||
|
qtreewidget.cpp \
|
||||||
|
qtreewidgetitemiterator.cpp \
|
||||||
|
qfileiconprovider.cpp \
|
||||||
qgraphicsgridlayout.cpp \
|
qgraphicsgridlayout.cpp \
|
||||||
qgraphicsitem.cpp \
|
qgraphicsitem.cpp \
|
||||||
qgraphicsitemanimation.cpp \
|
qgraphicsitemanimation.cpp \
|
||||||
@ -176,8 +177,8 @@ QT_SOURCES += \
|
|||||||
qscroller.cpp \
|
qscroller.cpp \
|
||||||
qscrollerproperties.cpp \
|
qscrollerproperties.cpp \
|
||||||
qflickgesture.cpp \
|
qflickgesture.cpp \
|
||||||
qundogroup.cpp \
|
|
||||||
qundostack.cpp \
|
qundostack.cpp \
|
||||||
|
qundogroup.cpp \
|
||||||
qundoview.cpp \
|
qundoview.cpp \
|
||||||
qsystemtrayicon_qpa.cpp \
|
qsystemtrayicon_qpa.cpp \
|
||||||
qguistatemachine.cpp \
|
qguistatemachine.cpp \
|
||||||
@ -215,7 +216,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qwidgetbackingstore_p.cpp \
|
moc_qwidgetbackingstore_p.cpp \
|
||||||
moc_qboxlayout.cpp \
|
moc_qboxlayout.cpp \
|
||||||
moc_qdesktopwidget.cpp \
|
moc_qdesktopwidget.cpp \
|
||||||
moc_qformlayout.cpp \
|
|
||||||
moc_qgridlayout.cpp \
|
moc_qgridlayout.cpp \
|
||||||
moc_qlayout.cpp \
|
moc_qlayout.cpp \
|
||||||
moc_qshortcut.cpp \
|
moc_qshortcut.cpp \
|
||||||
@ -229,19 +229,24 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qwidgetwindow_p.cpp \
|
moc_qwidgetwindow_p.cpp \
|
||||||
moc_qwindowcontainer_p.cpp \
|
moc_qwindowcontainer_p.cpp \
|
||||||
moc_qopenglwidget.cpp \
|
moc_qopenglwidget.cpp \
|
||||||
|
moc_qformlayout.cpp \
|
||||||
moc_qstyle.cpp \
|
moc_qstyle.cpp \
|
||||||
moc_qstyleanimation_p.cpp \
|
|
||||||
moc_qstyleplugin.cpp \
|
moc_qstyleplugin.cpp \
|
||||||
moc_qcommonstyle.cpp \
|
moc_qcommonstyle.cpp \
|
||||||
moc_qproxystyle.cpp \
|
moc_qproxystyle.cpp \
|
||||||
moc_qstylesheetstyle_p.cpp \
|
moc_qstylesheetstyle_p.cpp \
|
||||||
moc_qpixmapstyle_p.cpp \
|
moc_qpixmapstyle_p.cpp \
|
||||||
|
moc_qstyleanimation_p.cpp \
|
||||||
moc_qwindowsstyle_p.cpp \
|
moc_qwindowsstyle_p.cpp \
|
||||||
moc_qfusionstyle_p.cpp \
|
moc_qfusionstyle_p.cpp \
|
||||||
moc_qbuttongroup.cpp \
|
moc_qframe.cpp \
|
||||||
|
moc_qabstractscrollarea.cpp \
|
||||||
|
moc_qabstractscrollarea_p.cpp \
|
||||||
|
moc_qfocusframe.cpp \
|
||||||
|
moc_qwidgetanimator_p.cpp \
|
||||||
moc_qabstractbutton.cpp \
|
moc_qabstractbutton.cpp \
|
||||||
moc_qabstractslider.cpp \
|
moc_qabstractslider.cpp \
|
||||||
moc_qabstractspinbox.cpp \
|
moc_qbuttongroup.cpp \
|
||||||
moc_qcalendarwidget.cpp \
|
moc_qcalendarwidget.cpp \
|
||||||
moc_qcheckbox.cpp \
|
moc_qcheckbox.cpp \
|
||||||
moc_qcombobox.cpp \
|
moc_qcombobox.cpp \
|
||||||
@ -250,17 +255,16 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qdatetimeedit.cpp \
|
moc_qdatetimeedit.cpp \
|
||||||
moc_qdatetimeedit_p.cpp \
|
moc_qdatetimeedit_p.cpp \
|
||||||
moc_qdial.cpp \
|
moc_qdial.cpp \
|
||||||
moc_qdialogbuttonbox.cpp \
|
|
||||||
moc_qdockwidget.cpp \
|
moc_qdockwidget.cpp \
|
||||||
moc_qdockwidget_p.cpp \
|
moc_qdockwidget_p.cpp \
|
||||||
moc_qfontcombobox.cpp \
|
moc_qfontcombobox.cpp \
|
||||||
moc_qframe.cpp \
|
|
||||||
moc_qgroupbox.cpp \
|
moc_qgroupbox.cpp \
|
||||||
moc_qkeysequenceedit.cpp \
|
moc_qkeysequenceedit.cpp \
|
||||||
moc_qlabel.cpp \
|
moc_qlabel.cpp \
|
||||||
moc_qlcdnumber.cpp \
|
moc_qlcdnumber.cpp \
|
||||||
moc_qlineedit.cpp \
|
moc_qlineedit.cpp \
|
||||||
moc_qlineedit_p.cpp \
|
moc_qlineedit_p.cpp \
|
||||||
|
moc_qwidgetlinecontrol_p.cpp \
|
||||||
moc_qmainwindow.cpp \
|
moc_qmainwindow.cpp \
|
||||||
moc_qmainwindowlayout_p.cpp \
|
moc_qmainwindowlayout_p.cpp \
|
||||||
moc_qmdiarea.cpp \
|
moc_qmdiarea.cpp \
|
||||||
@ -270,67 +274,63 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qprogressbar.cpp \
|
moc_qprogressbar.cpp \
|
||||||
moc_qpushbutton.cpp \
|
moc_qpushbutton.cpp \
|
||||||
moc_qradiobutton.cpp \
|
moc_qradiobutton.cpp \
|
||||||
|
moc_qwidgetresizehandler_p.cpp \
|
||||||
|
moc_qdialogbuttonbox.cpp \
|
||||||
moc_qrubberband.cpp \
|
moc_qrubberband.cpp \
|
||||||
|
moc_qscrollarea.cpp \
|
||||||
moc_qscrollbar.cpp \
|
moc_qscrollbar.cpp \
|
||||||
moc_qsizegrip.cpp \
|
moc_qsizegrip.cpp \
|
||||||
moc_qslider.cpp \
|
moc_qslider.cpp \
|
||||||
|
moc_qabstractspinbox.cpp \
|
||||||
moc_qspinbox.cpp \
|
moc_qspinbox.cpp \
|
||||||
moc_qsplashscreen.cpp \
|
moc_qsplashscreen.cpp \
|
||||||
moc_qsplitter.cpp \
|
moc_qsplitter.cpp \
|
||||||
moc_qstackedwidget.cpp \
|
moc_qstackedwidget.cpp \
|
||||||
moc_qstatusbar.cpp \
|
moc_qstatusbar.cpp \
|
||||||
moc_qtabbar.cpp \
|
moc_qtabbar.cpp \
|
||||||
moc_qtabbar_p.cpp \
|
moc_qplaintextedit.cpp \
|
||||||
moc_qtabwidget.cpp \
|
moc_qplaintextedit_p.cpp \
|
||||||
moc_qtextedit.cpp \
|
moc_qtextedit.cpp \
|
||||||
moc_qtextbrowser.cpp \
|
moc_qtextbrowser.cpp \
|
||||||
|
moc_qtabwidget.cpp \
|
||||||
moc_qtoolbar.cpp \
|
moc_qtoolbar.cpp \
|
||||||
moc_qtoolbarlayout_p.cpp \
|
moc_qtoolbarlayout_p.cpp \
|
||||||
moc_qtoolbarextension_p.cpp \
|
|
||||||
moc_qtoolbarseparator_p.cpp \
|
moc_qtoolbarseparator_p.cpp \
|
||||||
moc_qtoolbox.cpp \
|
moc_qtoolbox.cpp \
|
||||||
moc_qtoolbutton.cpp \
|
moc_qtoolbutton.cpp \
|
||||||
moc_qabstractscrollarea.cpp \
|
moc_qtoolbarextension_p.cpp \
|
||||||
moc_qabstractscrollarea_p.cpp \
|
|
||||||
moc_qwidgetresizehandler_p.cpp \
|
|
||||||
moc_qfocusframe.cpp \
|
|
||||||
moc_qscrollarea.cpp \
|
|
||||||
moc_qwidgetanimator_p.cpp \
|
|
||||||
moc_qwidgettextcontrol_p.cpp \
|
moc_qwidgettextcontrol_p.cpp \
|
||||||
moc_qwidgetlinecontrol_p.cpp \
|
|
||||||
moc_qplaintextedit.cpp \
|
|
||||||
moc_qplaintextedit_p.cpp \
|
|
||||||
moc_qcolordialog.cpp \
|
moc_qcolordialog.cpp \
|
||||||
moc_qdialog.cpp \
|
moc_qdialog.cpp \
|
||||||
moc_qerrormessage.cpp \
|
moc_qerrormessage.cpp \
|
||||||
moc_qfiledialog.cpp \
|
moc_qfiledialog.cpp \
|
||||||
|
moc_qsidebar_p.cpp \
|
||||||
|
moc_qfilesystemmodel.cpp \
|
||||||
|
moc_qfileinfogatherer_p.cpp \
|
||||||
moc_qfontdialog.cpp \
|
moc_qfontdialog.cpp \
|
||||||
moc_qinputdialog.cpp \
|
moc_qinputdialog.cpp \
|
||||||
moc_qmessagebox.cpp \
|
moc_qmessagebox.cpp \
|
||||||
moc_qprogressdialog.cpp \
|
moc_qprogressdialog.cpp \
|
||||||
moc_qsidebar_p.cpp \
|
|
||||||
moc_qfilesystemmodel.cpp \
|
|
||||||
moc_qfileinfogatherer_p.cpp \
|
|
||||||
moc_qwizard.cpp \
|
moc_qwizard.cpp \
|
||||||
moc_qabstractitemview.cpp \
|
moc_qabstractitemview.cpp \
|
||||||
moc_qheaderview.cpp \
|
moc_qheaderview.cpp \
|
||||||
moc_qlistview.cpp \
|
|
||||||
moc_qtableview.cpp \
|
|
||||||
moc_qtreeview.cpp \
|
|
||||||
moc_qabstractitemdelegate.cpp \
|
moc_qabstractitemdelegate.cpp \
|
||||||
moc_qitemdelegate.cpp \
|
moc_qitemdelegate.cpp \
|
||||||
moc_qdirmodel.cpp \
|
|
||||||
moc_qlistwidget.cpp \
|
|
||||||
moc_qlistwidget_p.cpp \
|
|
||||||
moc_qtablewidget.cpp \
|
|
||||||
moc_qtablewidget_p.cpp \
|
|
||||||
moc_qtreewidget.cpp \
|
|
||||||
moc_qtreewidget_p.cpp \
|
|
||||||
moc_qitemeditorfactory_p.cpp \
|
moc_qitemeditorfactory_p.cpp \
|
||||||
moc_qdatawidgetmapper.cpp \
|
moc_qstyleditemdelegate.cpp \
|
||||||
moc_qcolumnviewgrip_p.cpp \
|
moc_qcolumnviewgrip_p.cpp \
|
||||||
moc_qcolumnview.cpp \
|
moc_qcolumnview.cpp \
|
||||||
moc_qstyleditemdelegate.cpp \
|
moc_qdatawidgetmapper.cpp \
|
||||||
|
moc_qdirmodel.cpp \
|
||||||
|
moc_qlistview.cpp \
|
||||||
|
moc_qlistwidget.cpp \
|
||||||
|
moc_qlistwidget_p.cpp \
|
||||||
|
moc_qtableview.cpp \
|
||||||
|
moc_qtablewidget.cpp \
|
||||||
|
moc_qtablewidget_p.cpp \
|
||||||
|
moc_qtreeview.cpp \
|
||||||
|
moc_qtreewidget.cpp \
|
||||||
|
moc_qtreewidget_p.cpp \
|
||||||
moc_qgraphicsitem.cpp \
|
moc_qgraphicsitem.cpp \
|
||||||
moc_qgraphicsitemanimation.cpp \
|
moc_qgraphicsitemanimation.cpp \
|
||||||
moc_qgraphicsproxywidget.cpp \
|
moc_qgraphicsproxywidget.cpp \
|
||||||
@ -343,15 +343,15 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
|||||||
moc_qgraphicswidget.cpp \
|
moc_qgraphicswidget.cpp \
|
||||||
moc_qgraphicsanchorlayout.cpp \
|
moc_qgraphicsanchorlayout.cpp \
|
||||||
moc_qsystemtrayicon.cpp \
|
moc_qsystemtrayicon.cpp \
|
||||||
|
moc_qsystemtrayicon_p.cpp \
|
||||||
moc_qcompleter.cpp \
|
moc_qcompleter.cpp \
|
||||||
moc_qcompleter_p.cpp \
|
moc_qcompleter_p.cpp \
|
||||||
moc_qsystemtrayicon_p.cpp \
|
|
||||||
moc_qscroller.cpp \
|
moc_qscroller.cpp \
|
||||||
moc_qscroller_p.cpp \
|
moc_qscroller_p.cpp \
|
||||||
moc_qflickgesture_p.cpp \
|
moc_qflickgesture_p.cpp \
|
||||||
moc_qundogroup.cpp \
|
|
||||||
moc_qundostack.cpp \
|
moc_qundostack.cpp \
|
||||||
moc_qundostack_p.cpp \
|
moc_qundostack_p.cpp \
|
||||||
|
moc_qundogroup.cpp \
|
||||||
moc_qundoview.cpp \
|
moc_qundoview.cpp \
|
||||||
moc_qkeyeventtransition.cpp \
|
moc_qkeyeventtransition.cpp \
|
||||||
moc_qmouseeventtransition.cpp \
|
moc_qmouseeventtransition.cpp \
|
||||||
@ -373,13 +373,14 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
|||||||
qfontcombobox.moc \
|
qfontcombobox.moc \
|
||||||
qmdisubwindow.moc \
|
qmdisubwindow.moc \
|
||||||
qmenu.moc \
|
qmenu.moc \
|
||||||
|
qtabbar.moc \
|
||||||
qtoolbox.moc \
|
qtoolbox.moc \
|
||||||
qcolordialog.moc \
|
qcolordialog.moc \
|
||||||
qfontdialog.moc \
|
qfontdialog.moc \
|
||||||
qinputdialog.moc \
|
qinputdialog.moc \
|
||||||
qmessagebox.moc \
|
qmessagebox.moc \
|
||||||
qtableview.moc \
|
|
||||||
qlistwidget.moc \
|
|
||||||
qitemeditorfactory.moc \
|
qitemeditorfactory.moc \
|
||||||
|
qlistwidget.moc \
|
||||||
|
qtableview.moc \
|
||||||
qundoview.moc
|
qundoview.moc
|
||||||
|
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
QT_DEFINES += -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtdeclarative/src/imports/window \
|
qtdeclarative/src/imports/window \
|
||||||
qtdeclarative/include/QtQuick/5.8.0 \
|
qtdeclarative/include/QtQuick/5.13.0 \
|
||||||
qtdeclarative/include/QtQuick/5.8.0/QtQuick \
|
qtdeclarative/include/QtQuick/5.13.0/QtQuick \
|
||||||
qtbase/include/QtGui/5.8.0 \
|
qtbase/include/QtGui/5.13.0 \
|
||||||
qtbase/include/QtGui/5.8.0/QtGui \
|
qtbase/include/QtGui/5.13.0/QtGui \
|
||||||
qtdeclarative/include \
|
qtdeclarative/include \
|
||||||
qtdeclarative/include/QtQuick \
|
qtdeclarative/include/QtQuick \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtGui \
|
qtbase/include/QtGui \
|
||||||
qtdeclarative/include/QtQml/5.8.0 \
|
qtdeclarative/include/QtQml/5.13.0 \
|
||||||
qtdeclarative/include/QtQml/5.8.0/QtQml \
|
qtdeclarative/include/QtQml/5.13.0/QtQml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtdeclarative/include/QtQml \
|
qtdeclarative/include/QtQml \
|
||||||
qtbase/include/QtNetwork \
|
qtbase/include/QtNetwork \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WTF -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WTF -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtwebkit/Source/WTF \
|
qtwebkit/Source/WTF \
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
QT_DEFINES += -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||||
|
|
||||||
QT_INCPATH += \
|
QT_INCPATH += \
|
||||||
qtbase/src/xml \
|
qtbase/src/xml \
|
||||||
qtbase/include \
|
qtbase/include \
|
||||||
qtbase/include/QtXml \
|
qtbase/include/QtXml \
|
||||||
qtbase/include/QtXml/5.8.0 \
|
qtbase/include/QtXml/5.13.0 \
|
||||||
qtbase/include/QtXml/5.8.0/QtXml \
|
qtbase/include/QtXml/5.13.0/QtXml \
|
||||||
qtbase/include/QtCore/5.8.0 \
|
qtbase/include/QtCore/5.13.0 \
|
||||||
qtbase/include/QtCore/5.8.0/QtCore \
|
qtbase/include/QtCore/5.13.0/QtCore \
|
||||||
qtbase/include/QtCore \
|
qtbase/include/QtCore \
|
||||||
qtbase/mkspecs/genode-g++
|
qtbase/mkspecs/genode-g++
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
ed964589f3a00f77bcf1c0011a8f43949e418ce0
|
7c7b00c66259f14c345536fa92cf0c9a234b0d68
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
LICENSE := GPL
|
LICENSE := GPL
|
||||||
VERSION := 5.8.0
|
VERSION := 5.13.0
|
||||||
|
|
||||||
QT5 := qtbase-opensource-src-${VERSION}
|
QT5 := qtbase-everywhere-src-${VERSION}
|
||||||
|
|
||||||
DOWNLOADS := ${QT5}.archive
|
DOWNLOADS := ${QT5}.archive
|
||||||
|
|
||||||
URL(${QT5}) := https://download.qt.io/archive/qt/5.8/$(VERSION)/submodules/$(QT5).tar.xz
|
URL(${QT5}) := https://download.qt.io/archive/qt/5.13/$(VERSION)/submodules/$(QT5).tar.xz
|
||||||
SHA(${QT5}) := c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005
|
SHA(${QT5}) := ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe
|
||||||
DIR(${QT5}) := src/lib/qt5-host
|
DIR(${QT5}) := src/lib/qt5-host
|
||||||
|
@ -1 +1 @@
|
|||||||
a4aa73007396403d6a54a0a3a659420603cd7a8c
|
5242d524294fc3ef0f9dbdd1765a8ca4207e6f43
|
||||||
|
@ -1,18 +1,19 @@
|
|||||||
LICENSE := GPL
|
LICENSE := GPL
|
||||||
VERSION := 5.8.0
|
VERSION := 5.13.0
|
||||||
|
QTWEBKIT_VERSION = 5.9.1
|
||||||
|
|
||||||
QT5 := qt-everywhere-opensource-src-${VERSION}
|
QT5 := qt-everywhere-src-${VERSION}
|
||||||
QT5_WEBKIT := qtwebkit-opensource-src-$(VERSION)
|
QT5_WEBKIT := qtwebkit-opensource-src-$(QTWEBKIT_VERSION)
|
||||||
QTSCRIPTCLASSIC := qtscriptclassic-1.0_1-opensource
|
QTSCRIPTCLASSIC := qtscriptclassic-1.0_1-opensource
|
||||||
|
|
||||||
DOWNLOADS := ${QT5}.archive ${QT5_WEBKIT}.archive ${QTSCRIPTCLASSIC}.archive symbols.git
|
DOWNLOADS := ${QT5}.archive ${QT5_WEBKIT}.archive ${QTSCRIPTCLASSIC}.archive symbols.git
|
||||||
|
|
||||||
URL(${QT5}) := https://download.qt.io/archive/qt/5.8/$(VERSION)/single/$(QT5).tar.xz
|
URL(${QT5}) := https://download.qt.io/archive/qt/5.13/$(VERSION)/single/$(QT5).tar.xz
|
||||||
SHA(${QT5}) := 0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6
|
SHA(${QT5}) := 2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6
|
||||||
DIR(${QT5}) := src/lib/qt5/qt5
|
DIR(${QT5}) := src/lib/qt5/qt5
|
||||||
|
|
||||||
URL(${QT5_WEBKIT}) := https://download.qt.io/community_releases/5.8/$(VERSION)-final/${QT5_WEBKIT}.tar.xz
|
URL(${QT5_WEBKIT}) := https://download.qt.io/archive/qt/5.9/$(QTWEBKIT_VERSION)/submodules/${QT5_WEBKIT}.tar.xz
|
||||||
SHA(${QT5_WEBKIT}) := 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec
|
SHA(${QT5_WEBKIT}) := 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf
|
||||||
DIR(${QT5_WEBKIT}) := src/lib/qt5/qt5/qtwebkit
|
DIR(${QT5_WEBKIT}) := src/lib/qt5/qt5/qtwebkit
|
||||||
|
|
||||||
URL(${QTSCRIPTCLASSIC}) := https://genode.org/files/ports/${QTSCRIPTCLASSIC}.tar.gz
|
URL(${QTSCRIPTCLASSIC}) := https://genode.org/files/ports/${QTSCRIPTCLASSIC}.tar.gz
|
||||||
@ -20,7 +21,7 @@ SHA(${QTSCRIPTCLASSIC}) := 6a4c4ada6f0064f6c5d7663602a37c99250ed6c7398b1775f95de
|
|||||||
DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC}
|
DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC}
|
||||||
|
|
||||||
URL(symbols) := https://github.com/cproc/genode-symbols.git
|
URL(symbols) := https://github.com/cproc/genode-symbols.git
|
||||||
REV(symbols) := f8a947501ce52fe8eb6893d26563278be2f42cc0
|
REV(symbols) := c3c6e9df42800e972cb37a1d96f618f00f7c7e99
|
||||||
DIR(symbols) := lib/symbols
|
DIR(symbols) := lib/symbols
|
||||||
|
|
||||||
|
|
||||||
@ -34,7 +35,11 @@ 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.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})}
|
||||||
PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5_7.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})}
|
PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5_7.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})}
|
||||||
|
|
||||||
MOC := /usr/local/genode-qt5/bin/moc
|
QT5_HOST_TOOL_INSTALL_LOCATION ?= /usr/local/genode/qt5/19.08
|
||||||
|
|
||||||
|
MOC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/moc
|
||||||
|
QFLOAT16TABLES = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/qfloat16-tables
|
||||||
|
QLALR = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/qlalr
|
||||||
|
|
||||||
$(call check_tool,bison)
|
$(call check_tool,bison)
|
||||||
$(call check_tool,flex)
|
$(call check_tool,flex)
|
||||||
@ -61,10 +66,24 @@ $(QMAKE): _patch
|
|||||||
$(VERBOSE)cd $(BUILD_DIR) && $(QT5_CONTRIB_DIR)/configure \
|
$(VERBOSE)cd $(BUILD_DIR) && $(QT5_CONTRIB_DIR)/configure \
|
||||||
-opensource \
|
-opensource \
|
||||||
-confirm-license \
|
-confirm-license \
|
||||||
|
-prefix / \
|
||||||
-no-iconv \
|
-no-iconv \
|
||||||
-no-opengl \
|
-no-opengl \
|
||||||
$(OUTPUT_FILTER)
|
$(OUTPUT_FILTER)
|
||||||
|
|
||||||
|
#
|
||||||
|
# generate Makefile from 'qtbase.pro' file
|
||||||
|
#
|
||||||
|
# $(1): path of 'qtbase.pro' file
|
||||||
|
#
|
||||||
|
define generate_qtbase_makefile
|
||||||
|
$(VERBOSE)mkdir -p $(dir $@) && \
|
||||||
|
cd $(dir $@) && \
|
||||||
|
$(QMAKE) -o $@ $(1) -qtconf $(BUILD_DIR)/qtbase/bin/qt.conf -- -opensource -confirm-license -prefix / $(OUTPUT_FILTER) && \
|
||||||
|
sed -i 's/first: all/first:/g' $@
|
||||||
|
endef
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# generate Makefile from Qmake project file
|
# generate Makefile from Qmake project file
|
||||||
#
|
#
|
||||||
@ -73,7 +92,7 @@ $(QMAKE): _patch
|
|||||||
define generate_makefile
|
define generate_makefile
|
||||||
$(VERBOSE)mkdir -p $(dir $@) && \
|
$(VERBOSE)mkdir -p $(dir $@) && \
|
||||||
cd $(dir $@) && \
|
cd $(dir $@) && \
|
||||||
$(QMAKE) -o $@ $(1) -qtconf $(BUILD_DIR)/qtbase/bin/qt.conf -- -opensource $(OUTPUT_FILTER) && \
|
$(QMAKE) -o $@ $(1) -qtconf $(BUILD_DIR)/qtbase/bin/qt.conf $(OUTPUT_FILTER) && \
|
||||||
sed -i 's/first: all/first:/g' $@
|
sed -i 's/first: all/first:/g' $@
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@ -113,8 +132,8 @@ $(BUILD_DIR)/qtbase/src/platformsupport/eventdispatchers/Makefile: $(BUILD_DIR)/
|
|||||||
$(BUILD_DIR)/qtbase/src/platformsupport/fontdatabases/Makefile: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile
|
$(BUILD_DIR)/qtbase/src/platformsupport/fontdatabases/Makefile: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile
|
||||||
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/fontdatabases.pro)
|
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/fontdatabases.pro)
|
||||||
|
|
||||||
$(BUILD_DIR)/qtbase/src/platformsupport/input/Makefile: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile
|
$(BUILD_DIR)/qtbase/src/platformsupport/input/Makefile.input-support: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile
|
||||||
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/input/input.pro)
|
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/input/input-support.pro)
|
||||||
|
|
||||||
# the 'include/QtWidgets' dependency is needed for a correct 'QtPrintSupportDepends' header
|
# the 'include/QtWidgets' dependency is needed for a correct 'QtPrintSupportDepends' header
|
||||||
$(BUILD_DIR)/qtbase/src/printsupport/Makefile: $(BUILD_DIR)/qtbase/src/Makefile include/QtWidgets
|
$(BUILD_DIR)/qtbase/src/printsupport/Makefile: $(BUILD_DIR)/qtbase/src/Makefile include/QtWidgets
|
||||||
@ -180,6 +199,17 @@ $(BUILD_DIR)/qttools/src/designer/src/uiplugin/Makefile: $(BUILD_DIR)/qttools/sr
|
|||||||
$(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile: $(BUILD_DIR)/qttools/src/designer/src/Makefile
|
$(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile: $(BUILD_DIR)/qttools/src/designer/src/Makefile
|
||||||
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/src/uitools/uitools.pro)
|
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/src/uitools/uitools.pro)
|
||||||
|
|
||||||
|
# qtvirtualkeyboard
|
||||||
|
|
||||||
|
$(BUILD_DIR)/qtvirtualkeyboard/Makefile: $(QMAKE)
|
||||||
|
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/qtvirtualkeyboard.pro)
|
||||||
|
|
||||||
|
$(BUILD_DIR)/qtvirtualkeyboard/src/Makefile: $(BUILD_DIR)/qtvirtualkeyboard/Makefile
|
||||||
|
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/src.pro)
|
||||||
|
|
||||||
|
$(BUILD_DIR)/qtvirtualkeyboard/src/virtualkeyboard/Makefile: $(BUILD_DIR)/qtvirtualkeyboard/src/Makefile
|
||||||
|
$(call generate_makefile, $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro)
|
||||||
|
|
||||||
# qtwebkit
|
# qtwebkit
|
||||||
|
|
||||||
$(BUILD_DIR)/qtwebkit/Makefile: $(QMAKE)
|
$(BUILD_DIR)/qtwebkit/Makefile: $(QMAKE)
|
||||||
@ -199,48 +229,50 @@ $(BUILD_DIR)/qtwebkit/Source/Makefile.widgetsapi: $(BUILD_DIR)/qtwebkit/Makefile
|
|||||||
|
|
||||||
include/QtCore: $(BUILD_DIR)/qtbase/src/corelib/Makefile
|
include/QtCore: $(BUILD_DIR)/qtbase/src/corelib/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/global/qconfig.h $@/
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/global/qconfig_p.h $@/$(VERSION)/QtCore/private/
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/qtcore-config.h $@/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/qtcore-config.h $@/
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/qtcore-config_p.h $@/$(VERSION)/QtCore/private/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/qtcore-config_p.h $@/$(VERSION)/QtCore/private/
|
||||||
|
|
||||||
include/QtEglSupport: $(BUILD_DIR)/qtbase/src/platformsupport/eglconvenience/Makefile
|
include/QtEglSupport: $(BUILD_DIR)/qtbase/src/platformsupport/eglconvenience/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtEventDispatcherSupport: $(BUILD_DIR)/qtbase/src/platformsupport/eventdispatchers/Makefile
|
include/QtEventDispatcherSupport: $(BUILD_DIR)/qtbase/src/platformsupport/eventdispatchers/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtFontDatabaseSupport: $(BUILD_DIR)/qtbase/src/platformsupport/fontdatabases/Makefile
|
include/QtFontDatabaseSupport: $(BUILD_DIR)/qtbase/src/platformsupport/fontdatabases/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtGui: $(BUILD_DIR)/qtbase/src/gui/Makefile
|
include/QtGui: $(BUILD_DIR)/qtbase/src/gui/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_qpa_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_qpa_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/gui/qtgui-config.h $@/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/gui/qtgui-config.h $@/
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/gui/qtgui-config_p.h $@/$(VERSION)/QtGui/private/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/gui/qtgui-config_p.h $@/$(VERSION)/QtGui/private/
|
||||||
|
|
||||||
include/QtInputSupport: $(BUILD_DIR)/qtbase/src/platformsupport/input/Makefile
|
include/QtInputSupport: $(BUILD_DIR)/qtbase/src/platformsupport/input/Makefile.input-support
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtNetwork: $(BUILD_DIR)/qtbase/src/network/Makefile
|
include/QtNetwork: $(BUILD_DIR)/qtbase/src/network/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/network/qtnetwork-config.h $@/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/network/qtnetwork-config.h $@/
|
||||||
@ -248,18 +280,18 @@ include/QtNetwork: $(BUILD_DIR)/qtbase/src/network/Makefile
|
|||||||
|
|
||||||
include/QtOpenGL: $(BUILD_DIR)/qtbase/src/opengl/Makefile
|
include/QtOpenGL: $(BUILD_DIR)/qtbase/src/opengl/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtPlatformHeaders: $(BUILD_DIR)/qtbase/src/platformheaders/Makefile
|
include/QtPlatformHeaders: $(BUILD_DIR)/qtbase/src/platformheaders/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtPrintSupport: $(BUILD_DIR)/qtbase/src/printsupport/Makefile
|
include/QtPrintSupport: $(BUILD_DIR)/qtbase/src/printsupport/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_qpa_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_qpa_headers $(OUTPUT_FILTER)
|
||||||
@ -268,21 +300,19 @@ include/QtPrintSupport: $(BUILD_DIR)/qtbase/src/printsupport/Makefile
|
|||||||
|
|
||||||
include/QtSql: $(BUILD_DIR)/qtbase/src/sql/Makefile
|
include/QtSql: $(BUILD_DIR)/qtbase/src/sql/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/sql/qtsql-config.h $@/
|
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/sql/qtsql-config_p.h $@/$(VERSION)/QtSql/private/
|
|
||||||
|
|
||||||
include/QtTest: $(BUILD_DIR)/qtbase/src/testlib/Makefile
|
include/QtTest: $(BUILD_DIR)/qtbase/src/testlib/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtWidgets: $(BUILD_DIR)/qtbase/src/widgets/Makefile
|
include/QtWidgets: $(BUILD_DIR)/qtbase/src/widgets/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/widgets/qtwidgets-config.h $@/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/widgets/qtwidgets-config.h $@/
|
||||||
@ -290,7 +320,7 @@ include/QtWidgets: $(BUILD_DIR)/qtbase/src/widgets/Makefile
|
|||||||
|
|
||||||
include/QtXml: $(BUILD_DIR)/qtbase/src/xml/Makefile
|
include/QtXml: $(BUILD_DIR)/qtbase/src/xml/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/xml/qtxml-config.h $@/
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/xml/qtxml-config.h $@/
|
||||||
@ -298,17 +328,23 @@ include/QtXml: $(BUILD_DIR)/qtbase/src/xml/Makefile
|
|||||||
|
|
||||||
# qtdeclarative
|
# qtdeclarative
|
||||||
|
|
||||||
include/QtQml: $(BUILD_DIR)/qtdeclarative/src/qml/Makefile
|
include/QtQml: $(BUILD_DIR)/qtdeclarative/src/qml/Makefile qtdeclarative_generated
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qtqml-config.h $@/
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qtqml-config_p.h $@/$(VERSION)/QtQml/private/
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qqmljsgrammar_p.h $@/$(VERSION)/QtQml/private/
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qqmljsparser_p.h $@/$(VERSION)/QtQml/private/
|
||||||
|
|
||||||
include/QtQuick: $(BUILD_DIR)/qtdeclarative/src/quick/Makefile
|
include/QtQuick: $(BUILD_DIR)/qtdeclarative/src/quick/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/qtquick-config.h $@/
|
||||||
|
$(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/qtquick-config_p.h $@/$(VERSION)/QtQuick/private/
|
||||||
|
|
||||||
# qtscriptclassic
|
# qtscriptclassic
|
||||||
|
|
||||||
@ -321,7 +357,7 @@ include/QtScript:
|
|||||||
|
|
||||||
include/QtSvg: $(BUILD_DIR)/qtsvg/src/svg/Makefile
|
include/QtSvg: $(BUILD_DIR)/qtsvg/src/svg/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
@ -329,18 +365,26 @@ include/QtSvg: $(BUILD_DIR)/qtsvg/src/svg/Makefile
|
|||||||
|
|
||||||
include/QtDesigner: $(BUILD_DIR)/qttools/src/designer/src/lib/Makefile
|
include/QtDesigner: $(BUILD_DIR)/qttools/src/designer/src/lib/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtUiPlugin: $(BUILD_DIR)/qttools/src/designer/src/uiplugin/Makefile
|
include/QtUiPlugin: $(BUILD_DIR)/qttools/src/designer/src/uiplugin/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtUiTools: $(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile
|
include/QtUiTools: $(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
|
# qtvirtualkeyboard
|
||||||
|
|
||||||
|
include/QtVirtualKeyboard: $(BUILD_DIR)/qtvirtualkeyboard/src/virtualkeyboard/Makefile
|
||||||
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
@ -348,25 +392,35 @@ include/QtUiTools: $(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile
|
|||||||
|
|
||||||
include/QtWebKit: $(BUILD_DIR)/qtwebkit/Source/Makefile.api
|
include/QtWebKit: $(BUILD_DIR)/qtwebkit/Source/Makefile.api
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
include/QtWebKitWidgets: $(BUILD_DIR)/qtwebkit/Source/Makefile.widgetsapi
|
include/QtWebKitWidgets: $(BUILD_DIR)/qtwebkit/Source/Makefile.widgetsapi
|
||||||
$(VERBOSE)$(MSG_GENERATE)$@
|
$(VERBOSE)$(MSG_GENERATE)$@
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_class_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER)
|
||||||
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
$(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER)
|
||||||
|
|
||||||
#
|
#
|
||||||
# additional generated headers
|
# additional generated files
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# qtbase
|
||||||
|
|
||||||
|
$(CURDIR)/src/lib/qt5/qt5/qtbase/src/corelib/global/qfloat16tables.cpp : _patch
|
||||||
|
$(VERBOSE) $(QFLOAT16TABLES) $@
|
||||||
|
|
||||||
# qtdeclarative
|
# qtdeclarative
|
||||||
|
|
||||||
$(CURDIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag: _patch
|
$(CURDIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag: _patch
|
||||||
$(VERBOSE)mkdir -p $(dir $@)
|
$(VERBOSE)mkdir -p $(dir $@)
|
||||||
$(VERBOSE)python $(QT5_CONTRIB_DIR)/qtdeclarative/src/3rdparty/masm/create_regex_tables > $(dir $@)/RegExpJitTables.h
|
$(VERBOSE)python $(QT5_CONTRIB_DIR)/qtdeclarative/src/3rdparty/masm/yarr/create_regex_tables > $(dir $@)/RegExpJitTables.h
|
||||||
|
$(VERBOSE)touch $@
|
||||||
|
|
||||||
|
$(CURDIR)/src/lib/qt5/qt5/qtdeclarative/src/qml/generated.tag: _patch
|
||||||
|
$(VERBOSE)mkdir -p $(dir $@)
|
||||||
|
$(VERBOSE)cd $(dir $@); $(QLALR) --no-debug --qt $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/parser/qqmljs.g
|
||||||
$(VERBOSE)touch $@
|
$(VERBOSE)touch $@
|
||||||
|
|
||||||
# qtwebkit
|
# qtwebkit
|
||||||
@ -522,14 +576,18 @@ qt5_headers: include/QtCore \
|
|||||||
include/QtDesigner \
|
include/QtDesigner \
|
||||||
include/QtUiPlugin \
|
include/QtUiPlugin \
|
||||||
include/QtUiTools \
|
include/QtUiTools \
|
||||||
|
include/QtVirtualKeyboard \
|
||||||
include/QtWebKit \
|
include/QtWebKit \
|
||||||
include/QtWebKitWidgets
|
include/QtWebKitWidgets
|
||||||
$(VERBOSE)rm -rf $(BUILD_DIR)
|
$(VERBOSE)rm -rf $(BUILD_DIR)
|
||||||
|
|
||||||
qtdeclarative_generated: $(CURDIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag
|
qtbase_generated: $(CURDIR)/src/lib/qt5/qt5/qtbase/src/corelib/global/qfloat16tables.cpp
|
||||||
|
|
||||||
|
qtdeclarative_generated: $(CURDIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag \
|
||||||
|
$(CURDIR)/src/lib/qt5/qt5/qtdeclarative/src/qml/generated.tag
|
||||||
|
|
||||||
qtwebkit_generated: $(CURDIR)/src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated/generated.tag \
|
qtwebkit_generated: $(CURDIR)/src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated/generated.tag \
|
||||||
$(CURDIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag \
|
$(CURDIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag \
|
||||||
$(CURDIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag
|
$(CURDIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag
|
||||||
|
|
||||||
default: qt5_headers qtdeclarative_generated qtwebkit_generated
|
default: qt5_headers qtbase_generated qtdeclarative_generated qtwebkit_generated
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
MIRROR_FROM_REP_DIR := lib/import/import-qt5_core.mk \
|
MIRROR_FROM_REP_DIR := lib/import/import-qt5_core.mk \
|
||||||
|
lib/import/import-qt5_pcre2.mk \
|
||||||
lib/import/import-qt5.inc
|
lib/import/import-qt5.inc
|
||||||
|
|
||||||
content: $(MIRROR_FROM_REP_DIR)
|
content: $(MIRROR_FROM_REP_DIR)
|
||||||
|
23
repos/libports/recipes/api/qt5_virtualkeyboard/content.mk
Normal file
23
repos/libports/recipes/api/qt5_virtualkeyboard/content.mk
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
MIRROR_FROM_REP_DIR := lib/import/import-qt5_virtualkeyboard.mk \
|
||||||
|
lib/import/import-qt5.inc
|
||||||
|
|
||||||
|
content: $(MIRROR_FROM_REP_DIR)
|
||||||
|
|
||||||
|
$(MIRROR_FROM_REP_DIR):
|
||||||
|
$(mirror_from_rep_dir)
|
||||||
|
|
||||||
|
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
||||||
|
|
||||||
|
MIRROR_FROM_PORT_DIR := include/QtVirtualKeyboard \
|
||||||
|
lib/symbols/qt5_virtualkeyboard
|
||||||
|
|
||||||
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
|
||||||
|
$(MIRROR_FROM_PORT_DIR):
|
||||||
|
mkdir -p $(dir $@)
|
||||||
|
cp -r $(PORT_DIR)/$@ $(dir $@)
|
||||||
|
|
||||||
|
content: LICENSE
|
||||||
|
|
||||||
|
LICENSE:
|
||||||
|
cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@
|
1
repos/libports/recipes/api/qt5_virtualkeyboard/hash
Normal file
1
repos/libports/recipes/api/qt5_virtualkeyboard/hash
Normal file
@ -0,0 +1 @@
|
|||||||
|
2019-08-25-c f6a3bb1ec4f67ea08fc33db2458289277c27967b
|
@ -5,7 +5,6 @@ _/src/jpeg
|
|||||||
_/src/libc
|
_/src/libc
|
||||||
_/src/libpng
|
_/src/libpng
|
||||||
_/src/mesa
|
_/src/mesa
|
||||||
_/src/pcre16
|
|
||||||
_/src/qt5_core
|
_/src/qt5_core
|
||||||
_/src/qt5_gui
|
_/src/qt5_gui
|
||||||
_/src/qt5_qjpeg
|
_/src/qt5_qjpeg
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
<rom label="libm.lib.so"/>
|
<rom label="libm.lib.so"/>
|
||||||
<rom label="libpng.lib.so"/>
|
<rom label="libpng.lib.so"/>
|
||||||
<rom label="mesa.lib.so"/>
|
<rom label="mesa.lib.so"/>
|
||||||
<rom label="pcre16.lib.so"/>
|
|
||||||
<rom label="qt5_core.lib.so"/>
|
<rom label="qt5_core.lib.so"/>
|
||||||
<rom label="qt5_dejavusans.tar"/>
|
<rom label="qt5_dejavusans.tar"/>
|
||||||
<rom label="qt5_gui.lib.so"/>
|
<rom label="qt5_gui.lib.so"/>
|
||||||
|
@ -13,10 +13,10 @@ $(INSTALL_DIR)/Styles:
|
|||||||
mkdir -p $@
|
mkdir -p $@
|
||||||
|
|
||||||
$(QMLDIR): $(INSTALL_DIR)
|
$(QMLDIR): $(INSTALL_DIR)
|
||||||
cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/virtualkeyboard/import/qmldir $@
|
cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/import/qmldir $@
|
||||||
|
|
||||||
$(STYLES_QMLDIR): $(INSTALL_DIR)/Styles
|
$(STYLES_QMLDIR): $(INSTALL_DIR)/Styles
|
||||||
cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/virtualkeyboard/styles/qmldir $@
|
cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/styles/qmldir $@
|
||||||
|
|
||||||
qt5_qtquick_virtualkeyboard.tar: $(QMLDIR) $(STYLES_QMLDIR)
|
qt5_qtquick_virtualkeyboard.tar: $(QMLDIR) $(STYLES_QMLDIR)
|
||||||
tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt
|
tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
MIRROR_FROM_REP_DIR := lib/mk/qt5_core.mk \
|
MIRROR_FROM_REP_DIR := lib/mk/qt5_core.mk \
|
||||||
lib/mk/qt5_core_generated.inc \
|
lib/mk/qt5_core_generated.inc \
|
||||||
|
lib/mk/qt5_pcre2.mk \
|
||||||
|
lib/mk/qt5_pcre2_generated.inc \
|
||||||
lib/mk/qt5.inc \
|
lib/mk/qt5.inc \
|
||||||
src/lib/qt5/qtbase/src/corelib \
|
src/lib/qt5/qtbase/src/corelib \
|
||||||
src/lib/qt5/libc_dummies.cc \
|
src/lib/qt5/libc_dummies.cc \
|
||||||
@ -24,10 +26,11 @@ MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/3rdparty/double-conversion \
|
|||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/harfbuzz \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/harfbuzz \
|
||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/md4 \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/md4 \
|
||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/md5 \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/md5 \
|
||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/pcre \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/pcre2 \
|
||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/rfc6234 \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/rfc6234 \
|
||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/sha1 \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/sha1 \
|
||||||
src/lib/qt5/qt5/qtbase/src/3rdparty/sha3 \
|
src/lib/qt5/qt5/qtbase/src/3rdparty/sha3 \
|
||||||
|
src/lib/qt5/qt5/qtbase/src/3rdparty/tinycbor \
|
||||||
src/lib/qt5/qt5/qtbase/src/corelib
|
src/lib/qt5/qt5/qtbase/src/corelib
|
||||||
|
|
||||||
content: $(MIRROR_FROM_PORT_DIR)
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
base
|
base
|
||||||
libc
|
libc
|
||||||
os
|
os
|
||||||
pcre16
|
|
||||||
so
|
so
|
||||||
stdcxx
|
stdcxx
|
||||||
timer_session
|
timer_session
|
||||||
|
@ -13,7 +13,8 @@ src/lib/qt5_gui/target.mk:
|
|||||||
|
|
||||||
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
||||||
|
|
||||||
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/gui
|
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/3rdparty/icc \
|
||||||
|
src/lib/qt5/qt5/qtbase/src/gui
|
||||||
|
|
||||||
content: $(MIRROR_FROM_PORT_DIR)
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
|
||||||
|
@ -13,11 +13,13 @@ src/lib/qt5_qpa_nitpicker/target.mk:
|
|||||||
|
|
||||||
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
||||||
|
|
||||||
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/gui/text/qfontengine_ft.cpp \
|
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/platformsupport/eglconvenience/qeglconvenience.cpp \
|
||||||
src/lib/qt5/qt5/qtbase/src/platformsupport/eglconvenience/qeglconvenience.cpp \
|
|
||||||
src/lib/qt5/qt5/qtbase/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp \
|
src/lib/qt5/qt5/qtbase/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp \
|
||||||
src/lib/qt5/qt5/qtbase/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp \
|
src/lib/qt5/qt5/qtbase/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp \
|
||||||
src/lib/qt5/qt5/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
src/lib/qt5/qt5/qtbase/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp \
|
||||||
|
src/lib/qt5/qt5/qtbase/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
content: $(MIRROR_FROM_PORT_DIR)
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
|
||||||
|
@ -20,7 +20,8 @@ src/lib/qt5_qtvirtualkeyboardstylesplugin/target.mk:
|
|||||||
|
|
||||||
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
||||||
|
|
||||||
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/virtualkeyboard
|
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/plugin \
|
||||||
|
src/lib/qt5/qt5/qtvirtualkeyboard/src/styles
|
||||||
|
|
||||||
content: $(MIRROR_FROM_PORT_DIR)
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
|
||||||
|
@ -7,4 +7,5 @@ qt5_network
|
|||||||
qt5_qml
|
qt5_qml
|
||||||
qt5_quick
|
qt5_quick
|
||||||
qt5_svg
|
qt5_svg
|
||||||
|
qt5_virtualkeyboard
|
||||||
stdcxx
|
stdcxx
|
||||||
|
1
repos/libports/recipes/src/qt5_virtualkeyboard/api
Normal file
1
repos/libports/recipes/src/qt5_virtualkeyboard/api
Normal file
@ -0,0 +1 @@
|
|||||||
|
qt5_virtualkeyboard
|
@ -1,15 +1,19 @@
|
|||||||
MIRROR_FROM_REP_DIR := src/app/qt5/examples/virtualkeyboard \
|
MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk \
|
||||||
src/app/qt5/tmpl/target_defaults.inc \
|
lib/mk/qt5_virtualkeyboard_generated.inc \
|
||||||
src/app/qt5/tmpl/target_final.inc
|
lib/mk/qt5.inc \
|
||||||
|
|
||||||
content: $(MIRROR_FROM_REP_DIR) LICENSE
|
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_virtualkeyboard/target.mk
|
||||||
|
|
||||||
$(MIRROR_FROM_REP_DIR):
|
$(MIRROR_FROM_REP_DIR):
|
||||||
$(mirror_from_rep_dir)
|
$(mirror_from_rep_dir)
|
||||||
|
|
||||||
|
src/lib/qt5_virtualkeyboard/target.mk:
|
||||||
|
mkdir -p $(dir $@)
|
||||||
|
echo "LIBS = qt5_virtualkeyboard" > $@
|
||||||
|
|
||||||
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
||||||
|
|
||||||
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/examples/virtualkeyboard/basic
|
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/virtualkeyboard
|
||||||
|
|
||||||
content: $(MIRROR_FROM_PORT_DIR)
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
|
||||||
@ -17,6 +21,7 @@ $(MIRROR_FROM_PORT_DIR):
|
|||||||
mkdir -p $(dir $@)
|
mkdir -p $(dir $@)
|
||||||
cp -r $(PORT_DIR)/$@ $(dir $@)
|
cp -r $(PORT_DIR)/$@ $(dir $@)
|
||||||
|
|
||||||
LICENSE:
|
content: LICENSE
|
||||||
cp $(GENODE_DIR)/LICENSE $@
|
|
||||||
|
|
||||||
|
LICENSE:
|
||||||
|
cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
base
|
base
|
||||||
libc
|
libc
|
||||||
mesa
|
mesa
|
||||||
qt5_component
|
|
||||||
qt5_core
|
qt5_core
|
||||||
qt5_network
|
|
||||||
qt5_gui
|
qt5_gui
|
||||||
qt5_qjpeg
|
qt5_network
|
||||||
qt5_qml
|
qt5_qml
|
||||||
qt5_qpa_nitpicker
|
|
||||||
qt5_quick
|
qt5_quick
|
||||||
stdcxx
|
stdcxx
|
||||||
|
zlib
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
MIRROR_FROM_REP_DIR := src/app/qt5/examples/virtualkeyboard \
|
||||||
|
src/app/qt5/tmpl/target_defaults.inc \
|
||||||
|
src/app/qt5/tmpl/target_final.inc
|
||||||
|
|
||||||
|
content: $(MIRROR_FROM_REP_DIR) LICENSE
|
||||||
|
|
||||||
|
$(MIRROR_FROM_REP_DIR):
|
||||||
|
$(mirror_from_rep_dir)
|
||||||
|
|
||||||
|
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
|
||||||
|
|
||||||
|
MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/examples/virtualkeyboard/basic
|
||||||
|
|
||||||
|
content: $(MIRROR_FROM_PORT_DIR)
|
||||||
|
|
||||||
|
$(MIRROR_FROM_PORT_DIR):
|
||||||
|
mkdir -p $(dir $@)
|
||||||
|
cp -r $(PORT_DIR)/$@ $(dir $@)
|
||||||
|
|
||||||
|
LICENSE:
|
||||||
|
cp $(GENODE_DIR)/LICENSE $@
|
||||||
|
|
@ -0,0 +1 @@
|
|||||||
|
2019-08-25-c 8b4606e7c0679acb38282514b207767bbabb95a1
|
@ -0,0 +1,13 @@
|
|||||||
|
base
|
||||||
|
libc
|
||||||
|
mesa
|
||||||
|
qt5_component
|
||||||
|
qt5_core
|
||||||
|
qt5_network
|
||||||
|
qt5_gui
|
||||||
|
qt5_qjpeg
|
||||||
|
qt5_qml
|
||||||
|
qt5_qpa_nitpicker
|
||||||
|
qt5_quick
|
||||||
|
qt5_virtualkeyboard
|
||||||
|
stdcxx
|
@ -18,7 +18,6 @@ import_from_depot [depot_user]/src/[base_src] \
|
|||||||
[depot_user]/src/nitpicker \
|
[depot_user]/src/nitpicker \
|
||||||
[depot_user]/src/global_keys_handler \
|
[depot_user]/src/global_keys_handler \
|
||||||
[depot_user]/src/rom_filter \
|
[depot_user]/src/rom_filter \
|
||||||
[depot_user]/src/pcre16 \
|
|
||||||
[depot_user]/src/qt5_core \
|
[depot_user]/src/qt5_core \
|
||||||
[depot_user]/src/qt5_gui \
|
[depot_user]/src/qt5_gui \
|
||||||
[depot_user]/src/qt5_qjpeg \
|
[depot_user]/src/qt5_qjpeg \
|
||||||
|
@ -3,7 +3,6 @@ create_boot_directory
|
|||||||
import_from_depot [depot_user]/src/[base_src] \
|
import_from_depot [depot_user]/src/[base_src] \
|
||||||
[depot_user]/src/init \
|
[depot_user]/src/init \
|
||||||
[depot_user]/src/libc \
|
[depot_user]/src/libc \
|
||||||
[depot_user]/src/pcre16 \
|
|
||||||
[depot_user]/src/qt5_component \
|
[depot_user]/src/qt5_component \
|
||||||
[depot_user]/src/qt5_core \
|
[depot_user]/src/qt5_core \
|
||||||
[depot_user]/src/stdcxx \
|
[depot_user]/src/stdcxx \
|
||||||
|
@ -18,7 +18,8 @@ import_from_depot [depot_user]/raw/qt5_qt_labs_folderlistmodel \
|
|||||||
[depot_user]/src/qt5_quick \
|
[depot_user]/src/qt5_quick \
|
||||||
[depot_user]/src/qt5_svg \
|
[depot_user]/src/qt5_svg \
|
||||||
[depot_user]/src/qt5_virtualkeyboard \
|
[depot_user]/src/qt5_virtualkeyboard \
|
||||||
[depot_user]/src/qt5_widgets
|
[depot_user]/src/qt5_widgets \
|
||||||
|
[depot_user]/src/qt5_virtualkeyboard_example
|
||||||
|
|
||||||
#
|
#
|
||||||
# Build
|
# Build
|
||||||
|
@ -12,6 +12,6 @@ CC_CXX_OPT += -D'MAIN_QML="basic-b2qt.qml"'
|
|||||||
|
|
||||||
include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc)
|
include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc)
|
||||||
|
|
||||||
LIBS += qt5_component
|
LIBS += qt5_component qt5_virtualkeyboard
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
--- a/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro 2017-08-14 11:23:48.610593201 +0200
|
example_virtualkeyboard.patch
|
||||||
+++ b/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro 2017-08-14 11:23:55.470642405 +0200
|
|
||||||
@@ -3,10 +3,10 @@
|
diff --git a/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro b/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro
|
||||||
|
index 27ad414..6383ffe 100644
|
||||||
|
--- a/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro
|
||||||
|
+++ b/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro
|
||||||
|
@@ -3,10 +3,10 @@ TARGET = basic
|
||||||
QT += qml quick
|
QT += qml quick
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
@ -15,8 +19,8 @@
|
|||||||
|
|
||||||
target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
@@ -24,13 +24,13 @@
|
@@ -22,13 +22,13 @@ OTHER_FILES += \
|
||||||
content/TextBase.qml \
|
content/TextArea.qml \
|
||||||
content/TextField.qml \
|
content/TextField.qml \
|
||||||
|
|
||||||
-disable-xcb {
|
-disable-xcb {
|
||||||
@ -28,12 +32,12 @@
|
|||||||
+# CONFIG += disable-desktop
|
+# CONFIG += disable-desktop
|
||||||
+#}
|
+#}
|
||||||
|
|
||||||
-disable-desktop|!isEmpty(CROSS_COMPILE)|qnx {
|
-disable-desktop|android-embedded|!isEmpty(CROSS_COMPILE)|qnx {
|
||||||
- DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\"
|
- DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\"
|
||||||
-} else {
|
-} else {
|
||||||
- DEFINES += MAIN_QML=\\\"Basic.qml\\\"
|
- DEFINES += MAIN_QML=\\\"Basic.qml\\\"
|
||||||
-}
|
-}
|
||||||
+#disable-desktop|!isEmpty(CROSS_COMPILE)|qnx {
|
+#disable-desktop|android-embedded|!isEmpty(CROSS_COMPILE)|qnx {
|
||||||
+# DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\"
|
+# DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\"
|
||||||
+#} else {
|
+#} else {
|
||||||
+# DEFINES += MAIN_QML=\\\"Basic.qml\\\"
|
+# DEFINES += MAIN_QML=\\\"Basic.qml\\\"
|
||||||
|
@ -1,34 +1,58 @@
|
|||||||
header_generation.patch
|
header_generation.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
Avoid errors on header generation during port preparation.
|
Avoid errors on header generation during port preparation.
|
||||||
---
|
|
||||||
qtbase/mkspecs/features/qmake_use.prf | 4 ++--
|
|
||||||
qtbase/mkspecs/features/qt.prf | 2 +-
|
|
||||||
.../Tools/qmake/mkspecs/features/default_pre.prf | 8 ++++----
|
|
||||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
|
diff --git a/qtbase/configure b/qtbase/configure
|
||||||
|
index 3bd39ed..8585108 100755
|
||||||
|
--- a/qtbase/configure
|
||||||
|
+++ b/qtbase/configure
|
||||||
|
@@ -89,11 +89,11 @@ if [ x"$1" = x"-top-level" ]; then
|
||||||
|
relpathMangled=`dirname "$relpath"`
|
||||||
|
outpathPrefix=../
|
||||||
|
shift
|
||||||
|
-else
|
||||||
|
- if [ -f ../.qmake.super ]; then
|
||||||
|
- echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
|
||||||
|
- exit 1
|
||||||
|
- fi
|
||||||
|
+#else
|
||||||
|
+# if [ -f ../.qmake.super ]; then
|
||||||
|
+# echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
|
||||||
|
+# exit 1
|
||||||
|
+# fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
OPT_CMDLINE= # expanded version for the script
|
||||||
diff --git a/qtbase/mkspecs/features/qmake_use.prf b/qtbase/mkspecs/features/qmake_use.prf
|
diff --git a/qtbase/mkspecs/features/qmake_use.prf b/qtbase/mkspecs/features/qmake_use.prf
|
||||||
index 9b6c67c..aa683d0 100644
|
index 64faa4f..78d7392 100644
|
||||||
--- a/qtbase/mkspecs/features/qmake_use.prf
|
--- a/qtbase/mkspecs/features/qmake_use.prf
|
||||||
+++ b/qtbase/mkspecs/features/qmake_use.prf
|
+++ b/qtbase/mkspecs/features/qmake_use.prf
|
||||||
@@ -14,8 +14,8 @@ for(ever) {
|
@@ -11,16 +11,16 @@ for(ever) {
|
||||||
defines = $$eval(QMAKE_DEFINES_$${nu})
|
}
|
||||||
includes = $$eval(QMAKE_INCDIR_$${nu})
|
CC_USES = $$resolve_depends(CC_USES, QMAKE_DEPENDS_, _CC)
|
||||||
|
for (nu, CC_USES) {
|
||||||
|
- !defined(QMAKE_LIBS_$$nu, var): \
|
||||||
|
- error("Library '$$lower($$replace(nu, _, -))' is not defined.")
|
||||||
|
+ #!defined(QMAKE_LIBS_$$nu, var): \
|
||||||
|
+ # error("Library '$$lower($$replace(nu, _, -))' is not defined.")
|
||||||
|
|
||||||
- isEmpty(libs):isEmpty(defines):isEmpty(includes): \
|
DEFINES += $$eval(QMAKE_DEFINES_$${nu})
|
||||||
- error("Library '$$name' is not defined.")
|
INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu})
|
||||||
+ #isEmpty(libs):isEmpty(defines):isEmpty(includes): \
|
}
|
||||||
+ # error("Library '$$name' is not defined.")
|
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
|
||||||
|
for (nu, LD_USES) {
|
||||||
|
- !defined(QMAKE_LIBS_$$nu, var): \
|
||||||
|
- error("Library '$$lower($$replace(nu, _, -))' is not defined.")
|
||||||
|
+ #!defined(QMAKE_LIBS_$$nu, var): \
|
||||||
|
+ # error("Library '$$lower($$replace(nu, _, -))' is not defined.")
|
||||||
|
|
||||||
!contains(use, nolink) {
|
debug: \
|
||||||
QMAKE_LIBDIR += $$libdir
|
LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_DEBUG) $$eval(QMAKE_LIBS_$$nu)
|
||||||
diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
|
diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
|
||||||
index 98f794c..f9beec7 100644
|
index 3a71376..f8a4d07 100644
|
||||||
--- a/qtbase/mkspecs/features/qt.prf
|
--- a/qtbase/mkspecs/features/qt.prf
|
||||||
+++ b/qtbase/mkspecs/features/qt.prf
|
+++ b/qtbase/mkspecs/features/qt.prf
|
||||||
@@ -153,7 +153,7 @@ for(ever) {
|
@@ -233,7 +233,7 @@ for(ever) {
|
||||||
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
|
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -37,6 +61,33 @@ index 98f794c..f9beec7 100644
|
|||||||
|
|
||||||
!isEmpty(var_sfx): break()
|
!isEmpty(var_sfx): break()
|
||||||
var_sfx = _PRIVATE
|
var_sfx = _PRIVATE
|
||||||
|
diff --git a/qtbase/mkspecs/features/qt_configure.prf b/qtbase/mkspecs/features/qt_configure.prf
|
||||||
|
index 94eb012..ee42acc 100644
|
||||||
|
--- a/qtbase/mkspecs/features/qt_configure.prf
|
||||||
|
+++ b/qtbase/mkspecs/features/qt_configure.prf
|
||||||
|
@@ -2256,14 +2256,14 @@ defineTest(qtConfProcessOutput) {
|
||||||
|
|
||||||
|
!isEmpty(_QMAKE_SUPER_CACHE_):!equals(OUT_PWD, $$dirname(_QMAKE_SUPER_CACHE_)) {
|
||||||
|
# sub-repo within a top-level build; no need to configure anything.
|
||||||
|
- !isEmpty(QMAKE_EXTRA_ARGS) {
|
||||||
|
- # sub-projects don't get the extra args passed down automatically,
|
||||||
|
- # so we can use their presence to detect misguided attempts to
|
||||||
|
- # configure the repositories separately.
|
||||||
|
- # caveat: a plain qmake call is indistinguishable from a recursion
|
||||||
|
- # (by design), so we cannot detect this case.
|
||||||
|
- error("You cannot configure $$TARGET separately within a top-level build.")
|
||||||
|
- }
|
||||||
|
+# !isEmpty(QMAKE_EXTRA_ARGS) {
|
||||||
|
+# # sub-projects don't get the extra args passed down automatically,
|
||||||
|
+# # so we can use their presence to detect misguided attempts to
|
||||||
|
+# # configure the repositories separately.
|
||||||
|
+# # caveat: a plain qmake call is indistinguishable from a recursion
|
||||||
|
+# # (by design), so we cannot detect this case.
|
||||||
|
+# error("You cannot configure $$TARGET separately within a top-level build.")
|
||||||
|
+# }
|
||||||
|
return()
|
||||||
|
}
|
||||||
|
|
||||||
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf b/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf
|
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf b/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf
|
||||||
index 5c36e93..5a52092 100644
|
index 5c36e93..5a52092 100644
|
||||||
--- a/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf
|
--- a/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf
|
||||||
|
@ -1,18 +1,13 @@
|
|||||||
host_tools.patch
|
host_tools.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
Support shadow build of the host tools when the source tree already
|
Support shadow build of the host tools when the source tree already
|
||||||
contains generated files.
|
contains generated files.
|
||||||
---
|
|
||||||
qtbase/configure | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtbase/configure b/qtbase/configure
|
diff --git a/qtbase/configure b/qtbase/configure
|
||||||
index a901fa0..a3e7df7 100755
|
index ef7bad1..3bd39ed 100755
|
||||||
--- a/qtbase/configure
|
--- a/qtbase/configure
|
||||||
+++ b/qtbase/configure
|
+++ b/qtbase/configure
|
||||||
@@ -1299,11 +1299,11 @@ if [ "$OPT_SHADOW" = "maybe" ]; then
|
@@ -673,11 +673,11 @@ if [ "$OPT_SHADOW" = "maybe" ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ "$OPT_SHADOW" = "yes" ]; then
|
if [ "$OPT_SHADOW" = "yes" ]; then
|
||||||
|
@ -1,36 +1,10 @@
|
|||||||
qtbase_configuration.patch
|
qtbase_configuration.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtbase/configure | 1
|
|
||||||
qtbase/mkspecs/features/qt_build_config.prf | 2 -
|
|
||||||
qtbase/mkspecs/genode-g++/qmake.conf | 10 +++
|
|
||||||
qtbase/mkspecs/genode-g++/qplatformdefs.h | 87 +++++++++++++++++++++++++++
|
|
||||||
qtbase/src/corelib/global/global.pri | 10 ++-
|
|
||||||
qtbase/src/corelib/io/io.pri | 2 -
|
|
||||||
6 files changed, 105 insertions(+), 7 deletions(-)
|
|
||||||
create mode 100644 qtbase/mkspecs/genode-g++/qmake.conf
|
|
||||||
create mode 100644 qtbase/mkspecs/genode-g++/qplatformdefs.h
|
|
||||||
|
|
||||||
diff --git a/qtbase/configure b/qtbase/configure
|
|
||||||
index bc18e61..a901fa0 100755
|
|
||||||
--- a/qtbase/configure
|
|
||||||
+++ b/qtbase/configure
|
|
||||||
@@ -945,6 +945,7 @@ if [ -z "$PLATFORM" ]; then
|
|
||||||
- Also available for UnixWare: unixware-g++
|
|
||||||
"
|
|
||||||
;;
|
|
||||||
+
|
|
||||||
SCO_SV:*)
|
|
||||||
#PLATFORM=sco-g++
|
|
||||||
PLATFORM=sco-cc
|
|
||||||
diff --git a/qtbase/mkspecs/features/qt_build_config.prf b/qtbase/mkspecs/features/qt_build_config.prf
|
diff --git a/qtbase/mkspecs/features/qt_build_config.prf b/qtbase/mkspecs/features/qt_build_config.prf
|
||||||
index 3762c14..1596dd5 100644
|
index 0c6c10d..329d1c2 100644
|
||||||
--- a/qtbase/mkspecs/features/qt_build_config.prf
|
--- a/qtbase/mkspecs/features/qt_build_config.prf
|
||||||
+++ b/qtbase/mkspecs/features/qt_build_config.prf
|
+++ b/qtbase/mkspecs/features/qt_build_config.prf
|
||||||
@@ -132,5 +132,5 @@ defineTest(qtConfig) {
|
@@ -141,5 +141,5 @@ defineTest(qtConfig) {
|
||||||
contains(QT.$${module}.disabled_features, $$1): \
|
contains(QT.$${module}.disabled_features, $$1): \
|
||||||
return(false)
|
return(false)
|
||||||
}
|
}
|
||||||
@ -147,10 +121,10 @@ index 0000000..5e5c341
|
|||||||
+
|
+
|
||||||
+#endif // QPLATFORMDEFS_H
|
+#endif // QPLATFORMDEFS_H
|
||||||
diff --git a/qtbase/src/corelib/global/global.pri b/qtbase/src/corelib/global/global.pri
|
diff --git a/qtbase/src/corelib/global/global.pri b/qtbase/src/corelib/global/global.pri
|
||||||
index f74662b..391df22 100644
|
index 029357f..52086f2 100644
|
||||||
--- a/qtbase/src/corelib/global/global.pri
|
--- a/qtbase/src/corelib/global/global.pri
|
||||||
+++ b/qtbase/src/corelib/global/global.pri
|
+++ b/qtbase/src/corelib/global/global.pri
|
||||||
@@ -41,11 +41,11 @@ PRECOMPILED_HEADER = global/qt_pch.h
|
@@ -78,11 +78,11 @@ PRECOMPILED_HEADER = global/qt_pch.h
|
||||||
# qlogging.cpp uses backtrace(3), which is in a separate library on the BSDs.
|
# qlogging.cpp uses backtrace(3), which is in a separate library on the BSDs.
|
||||||
LIBS_PRIVATE += $$QMAKE_LIBS_EXECINFO
|
LIBS_PRIVATE += $$QMAKE_LIBS_EXECINFO
|
||||||
|
|
||||||
@ -165,18 +139,34 @@ index f74662b..391df22 100644
|
|||||||
+# DEFINES += ELF_INTERPRETER=\\\"$$system(LC_ALL=C readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
|
+# DEFINES += ELF_INTERPRETER=\\\"$$system(LC_ALL=C readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
|
||||||
+#}
|
+#}
|
||||||
|
|
||||||
slog2 {
|
linux:!static {
|
||||||
LIBS_PRIVATE += -lslog2
|
precompile_header {
|
||||||
diff --git a/qtbase/src/corelib/io/io.pri b/qtbase/src/corelib/io/io.pri
|
diff --git a/qtbase/src/corelib/io/io.pri b/qtbase/src/corelib/io/io.pri
|
||||||
index 0414ae9..fdbd1af 100644
|
index 9b60447..fcda10c 100644
|
||||||
--- a/qtbase/src/corelib/io/io.pri
|
--- a/qtbase/src/corelib/io/io.pri
|
||||||
+++ b/qtbase/src/corelib/io/io.pri
|
+++ b/qtbase/src/corelib/io/io.pri
|
||||||
@@ -166,7 +166,7 @@ win32 {
|
@@ -199,7 +199,7 @@ win32 {
|
||||||
} else {
|
} else {
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
io/qstandardpaths_unix.cpp \
|
io/qstandardpaths_unix.cpp \
|
||||||
- io/qstorageinfo_unix.cpp
|
- io/qstorageinfo_unix.cpp
|
||||||
+ io/qstorageinfo_stub.cpp
|
+ io/qstorageinfo_stub.cpp
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
linux|if(qnx:qtConfig(inotify)) {
|
diff --git a/qtbase/src/corelib/io/qfilesystemwatcher.cpp b/qtbase/src/corelib/io/qfilesystemwatcher.cpp
|
||||||
|
index f40e166..26522bc 100644
|
||||||
|
--- a/qtbase/src/corelib/io/qfilesystemwatcher.cpp
|
||||||
|
+++ b/qtbase/src/corelib/io/qfilesystemwatcher.cpp
|
||||||
|
@@ -47,9 +47,11 @@
|
||||||
|
#include <qset.h>
|
||||||
|
#include <qtimer.h>
|
||||||
|
|
||||||
|
+#if !defined(QT_NO_INOTIFY)
|
||||||
|
#if defined(Q_OS_LINUX) || (defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY))
|
||||||
|
#define USE_INOTIFY
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "qfilesystemwatcher_polling_p.h"
|
||||||
|
#if defined(Q_OS_WIN)
|
||||||
|
@ -1,60 +1,10 @@
|
|||||||
qtbase_fixes.patch
|
qtbase_fixes.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtbase/src/network/socket/qnativesocketengine_p.h | 4 ++++
|
|
||||||
.../network/socket/qnativesocketengine_unix.cpp | 2 ++
|
|
||||||
qtbase/src/widgets/kernel/qwidgetwindow.cpp | 3 +++
|
|
||||||
qtbase/src/widgets/widgets/qwidgetanimator.cpp | 3 ++-
|
|
||||||
4 files changed, 11 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/qtbase/src/network/socket/qnativesocketengine_p.h b/qtbase/src/network/socket/qnativesocketengine_p.h
|
|
||||||
index 46c7ae5..b6c4378 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 d1efc21..d981675 100644
|
|
||||||
--- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
|
||||||
+++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
|
||||||
@@ -121,8 +121,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/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
||||||
index 3e15b69..b91fbcf 100644
|
index fbc71cd..143cc60 100644
|
||||||
--- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
--- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
||||||
+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
||||||
@@ -324,6 +324,9 @@ bool QWidgetWindow::event(QEvent *event)
|
@@ -369,6 +369,9 @@ bool QWidgetWindow::event(QEvent *event)
|
||||||
m_widget->repaint();
|
m_widget->repaint();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
@ -65,10 +15,10 @@ index 3e15b69..b91fbcf 100644
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
diff --git a/qtbase/src/widgets/widgets/qwidgetanimator.cpp b/qtbase/src/widgets/widgets/qwidgetanimator.cpp
|
diff --git a/qtbase/src/widgets/widgets/qwidgetanimator.cpp b/qtbase/src/widgets/widgets/qwidgetanimator.cpp
|
||||||
index d46d655..5ef6967 100644
|
index 486d65d..6ab6798 100644
|
||||||
--- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp
|
--- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp
|
||||||
+++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp
|
+++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp
|
||||||
@@ -73,7 +73,8 @@ void QWidgetAnimator::abort(QWidget *w)
|
@@ -81,7 +81,8 @@ void QWidgetAnimator::abort(QWidget *w)
|
||||||
void QWidgetAnimator::animationFinished()
|
void QWidgetAnimator::animationFinished()
|
||||||
{
|
{
|
||||||
QPropertyAnimation *anim = qobject_cast<QPropertyAnimation*>(sender());
|
QPropertyAnimation *anim = qobject_cast<QPropertyAnimation*>(sender());
|
||||||
@ -76,5 +26,5 @@ index d46d655..5ef6967 100644
|
|||||||
+ if (anim)
|
+ if (anim)
|
||||||
+ abort(static_cast<QWidget*>(anim->targetObject()));
|
+ abort(static_cast<QWidget*>(anim->targetObject()));
|
||||||
}
|
}
|
||||||
#endif //QT_NO_ANIMATION
|
#endif // animation
|
||||||
|
|
||||||
|
@ -1,107 +1,17 @@
|
|||||||
qtbase_generated.patch
|
qtbase_generated.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
diff --git a/qtbase/include/QtCore/5.13.0/QtCore/private/qconfig_p.h b/qtbase/include/QtCore/5.13.0/QtCore/private/qconfig_p.h
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
.../QtCore/5.8.0/QtCore/private/qconfig_p.h | 1
|
|
||||||
.../QtCore/5.8.0/QtCore/private/qtcore-config_p.h | 1
|
|
||||||
qtbase/include/QtCore/QtConfig | 1
|
|
||||||
qtbase/include/QtCore/QtCoreDepends | 1
|
|
||||||
qtbase/include/QtCore/qconfig.h | 1
|
|
||||||
qtbase/include/QtCore/qfeatures.h | 1
|
|
||||||
qtbase/include/QtCore/qtcore-config.h | 1
|
|
||||||
.../QtGui/5.8.0/QtGui/private/qtgui-config_p.h | 1
|
|
||||||
qtbase/include/QtGui/QtGuiDepends | 2 +
|
|
||||||
qtbase/include/QtGui/qtgui-config.h | 1
|
|
||||||
.../5.8.0/QtNetwork/private/qtnetwork-config_p.h | 1
|
|
||||||
qtbase/include/QtNetwork/QtNetworkDepends | 2 +
|
|
||||||
qtbase/include/QtNetwork/qtnetwork-config.h | 1
|
|
||||||
qtbase/include/QtOpenGL/QtOpenGLDepends | 4 +
|
|
||||||
.../private/qtprintsupport-config_p.h | 1
|
|
||||||
.../include/QtPrintSupport/QtPrintSupportDepends | 4 +
|
|
||||||
.../include/QtPrintSupport/qtprintsupport-config.h | 1
|
|
||||||
qtbase/include/QtSql/QtSqlDepends | 2 +
|
|
||||||
qtbase/include/QtTest/QtTestDepends | 4 +
|
|
||||||
.../5.8.0/QtWidgets/private/qtwidgets-config_p.h | 1
|
|
||||||
qtbase/include/QtWidgets/QtWidgetsDepends | 3 +
|
|
||||||
qtbase/include/QtWidgets/qtwidgets-config.h | 1
|
|
||||||
.../QtXml/5.8.0/QtXml/private/qtxml-config_p.h | 1
|
|
||||||
qtbase/include/QtXml/QtXmlDepends | 2 +
|
|
||||||
qtbase/include/QtXml/qtxml-config.h | 1
|
|
||||||
qtbase/src/corelib/global/qconfig.cpp | 51 +++++++++++++++
|
|
||||||
qtbase/src/corelib/global/qconfig.h | 24 +++++++
|
|
||||||
qtbase/src/corelib/global/qconfig_p.h | 12 ++++
|
|
||||||
qtbase/src/corelib/qtcore-config.h | 39 +++++++++++
|
|
||||||
qtbase/src/corelib/qtcore-config_p.h | 16 +++++
|
|
||||||
qtbase/src/gui/qtgui-config.h | 43 +++++++++++++
|
|
||||||
qtbase/src/gui/qtgui-config_p.h | 40 ++++++++++++
|
|
||||||
qtbase/src/network/qtnetwork-config.h | 16 +++++
|
|
||||||
qtbase/src/network/qtnetwork-config_p.h | 5 +
|
|
||||||
qtbase/src/printsupport/qtprintsupport-config.h | 5 +
|
|
||||||
qtbase/src/printsupport/qtprintsupport-config_p.h | 1
|
|
||||||
qtbase/src/sql/qtsql-config.h | 9 +++
|
|
||||||
qtbase/src/sql/qtsql-config_p.h | 1
|
|
||||||
qtbase/src/widgets/qtwidgets-config.h | 68 ++++++++++++++++++++
|
|
||||||
qtbase/src/widgets/qtwidgets-config_p.h | 1
|
|
||||||
qtbase/src/xml/qtxml-config.h | 1
|
|
||||||
qtbase/src/xml/qtxml-config_p.h | 0
|
|
||||||
42 files changed, 372 insertions(+)
|
|
||||||
create mode 100644 qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h
|
|
||||||
create mode 100644 qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h
|
|
||||||
create mode 100644 qtbase/include/QtCore/QtConfig
|
|
||||||
create mode 100644 qtbase/include/QtCore/QtCoreDepends
|
|
||||||
create mode 100644 qtbase/include/QtCore/qconfig.h
|
|
||||||
create mode 100644 qtbase/include/QtCore/qfeatures.h
|
|
||||||
create mode 100644 qtbase/include/QtCore/qtcore-config.h
|
|
||||||
create mode 100644 qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h
|
|
||||||
create mode 100644 qtbase/include/QtGui/QtGuiDepends
|
|
||||||
create mode 100644 qtbase/include/QtGui/qtgui-config.h
|
|
||||||
create mode 100644 qtbase/include/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h
|
|
||||||
create mode 100644 qtbase/include/QtNetwork/QtNetworkDepends
|
|
||||||
create mode 100644 qtbase/include/QtNetwork/qtnetwork-config.h
|
|
||||||
create mode 100644 qtbase/include/QtOpenGL/QtOpenGLDepends
|
|
||||||
create mode 100644 qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h
|
|
||||||
create mode 100644 qtbase/include/QtPrintSupport/QtPrintSupportDepends
|
|
||||||
create mode 100644 qtbase/include/QtPrintSupport/qtprintsupport-config.h
|
|
||||||
create mode 100644 qtbase/include/QtSql/QtSqlDepends
|
|
||||||
create mode 100644 qtbase/include/QtTest/QtTestDepends
|
|
||||||
create mode 100644 qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h
|
|
||||||
create mode 100644 qtbase/include/QtWidgets/QtWidgetsDepends
|
|
||||||
create mode 100644 qtbase/include/QtWidgets/qtwidgets-config.h
|
|
||||||
create mode 100644 qtbase/include/QtXml/5.8.0/QtXml/private/qtxml-config_p.h
|
|
||||||
create mode 100644 qtbase/include/QtXml/QtXmlDepends
|
|
||||||
create mode 100644 qtbase/include/QtXml/qtxml-config.h
|
|
||||||
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/qconfig_p.h
|
|
||||||
create mode 100644 qtbase/src/corelib/qtcore-config.h
|
|
||||||
create mode 100644 qtbase/src/corelib/qtcore-config_p.h
|
|
||||||
create mode 100644 qtbase/src/gui/qtgui-config.h
|
|
||||||
create mode 100644 qtbase/src/gui/qtgui-config_p.h
|
|
||||||
create mode 100644 qtbase/src/network/qtnetwork-config.h
|
|
||||||
create mode 100644 qtbase/src/network/qtnetwork-config_p.h
|
|
||||||
create mode 100644 qtbase/src/printsupport/qtprintsupport-config.h
|
|
||||||
create mode 100644 qtbase/src/printsupport/qtprintsupport-config_p.h
|
|
||||||
create mode 100644 qtbase/src/sql/qtsql-config.h
|
|
||||||
create mode 100644 qtbase/src/sql/qtsql-config_p.h
|
|
||||||
create mode 100644 qtbase/src/widgets/qtwidgets-config.h
|
|
||||||
create mode 100644 qtbase/src/widgets/qtwidgets-config_p.h
|
|
||||||
create mode 100644 qtbase/src/xml/qtxml-config.h
|
|
||||||
create mode 100644 qtbase/src/xml/qtxml-config_p.h
|
|
||||||
|
|
||||||
diff --git a/qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h b/qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h
|
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..aedf7fa
|
index 0000000..aedf7fa
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h
|
+++ b/qtbase/include/QtCore/5.13.0/QtCore/private/qconfig_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/corelib/global/qconfig_p.h"
|
+#include "../../../../../src/corelib/global/qconfig_p.h"
|
||||||
diff --git a/qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h b/qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h
|
diff --git a/qtbase/include/QtCore/5.13.0/QtCore/private/qtcore-config_p.h b/qtbase/include/QtCore/5.13.0/QtCore/private/qtcore-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..53f2212
|
index 0000000..53f2212
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h
|
+++ b/qtbase/include/QtCore/5.13.0/QtCore/private/qtcore-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/corelib/qtcore-config_p.h"
|
+#include "../../../../../src/corelib/qtcore-config_p.h"
|
||||||
diff --git a/qtbase/include/QtCore/QtConfig b/qtbase/include/QtCore/QtConfig
|
diff --git a/qtbase/include/QtCore/QtConfig b/qtbase/include/QtCore/QtConfig
|
||||||
@ -113,11 +23,13 @@ index 0000000..c734263
|
|||||||
+#include "qconfig.h"
|
+#include "qconfig.h"
|
||||||
diff --git a/qtbase/include/QtCore/QtCoreDepends b/qtbase/include/QtCore/QtCoreDepends
|
diff --git a/qtbase/include/QtCore/QtCoreDepends b/qtbase/include/QtCore/QtCoreDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..f6a4430
|
index 0000000..a953540
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtCore/QtCoreDepends
|
+++ b/qtbase/include/QtCore/QtCoreDepends
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1,3 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/corelib/corelib.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/corelib/corelib.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
|
+#endif
|
||||||
diff --git a/qtbase/include/QtCore/qconfig.h b/qtbase/include/QtCore/qconfig.h
|
diff --git a/qtbase/include/QtCore/qconfig.h b/qtbase/include/QtCore/qconfig.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..aa8a3d6
|
index 0000000..aa8a3d6
|
||||||
@ -125,13 +37,6 @@ index 0000000..aa8a3d6
|
|||||||
+++ b/qtbase/include/QtCore/qconfig.h
|
+++ b/qtbase/include/QtCore/qconfig.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../src/corelib/global/qconfig.h"
|
+#include "../../src/corelib/global/qconfig.h"
|
||||||
diff --git a/qtbase/include/QtCore/qfeatures.h b/qtbase/include/QtCore/qfeatures.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..2501992
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/qtbase/include/QtCore/qfeatures.h
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+#include "../../src/corelib/global/qfeatures.h"
|
|
||||||
diff --git a/qtbase/include/QtCore/qtcore-config.h b/qtbase/include/QtCore/qtcore-config.h
|
diff --git a/qtbase/include/QtCore/qtcore-config.h b/qtbase/include/QtCore/qtcore-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..29ef59d
|
index 0000000..29ef59d
|
||||||
@ -139,21 +44,44 @@ index 0000000..29ef59d
|
|||||||
+++ b/qtbase/include/QtCore/qtcore-config.h
|
+++ b/qtbase/include/QtCore/qtcore-config.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../src/corelib/qtcore-config.h"
|
+#include "../../src/corelib/qtcore-config.h"
|
||||||
diff --git a/qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h b/qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h
|
diff --git a/qtbase/include/QtGui/5.13.0/QtGui/private/qtgui-config_p.h b/qtbase/include/QtGui/5.13.0/QtGui/private/qtgui-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..fa5bd06
|
index 0000000..fa5bd06
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h
|
+++ b/qtbase/include/QtGui/5.13.0/QtGui/private/qtgui-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/gui/qtgui-config_p.h"
|
+#include "../../../../../src/gui/qtgui-config_p.h"
|
||||||
|
diff --git a/qtbase/include/QtGui/5.13.0/QtGui/private/qvulkanfunctions_p.h b/qtbase/include/QtGui/5.13.0/QtGui/private/qvulkanfunctions_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..f2d2da0
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtGui/5.13.0/QtGui/private/qvulkanfunctions_p.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "../../../../../src/gui/vulkan/qvulkanfunctions_p.h"
|
||||||
|
diff --git a/qtbase/include/QtGui/QVulkanDeviceFunctions b/qtbase/include/QtGui/QVulkanDeviceFunctions
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..141a561
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtGui/QVulkanDeviceFunctions
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "qvulkanfunctions.h"
|
||||||
|
diff --git a/qtbase/include/QtGui/QVulkanFunctions b/qtbase/include/QtGui/QVulkanFunctions
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..141a561
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtGui/QVulkanFunctions
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "qvulkanfunctions.h"
|
||||||
diff --git a/qtbase/include/QtGui/QtGuiDepends b/qtbase/include/QtGui/QtGuiDepends
|
diff --git a/qtbase/include/QtGui/QtGuiDepends b/qtbase/include/QtGui/QtGuiDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..52697ae
|
index 0000000..7611c06
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtGui/QtGuiDepends
|
+++ b/qtbase/include/QtGui/QtGuiDepends
|
||||||
@@ -0,0 +1,2 @@
|
@@ -0,0 +1,4 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/gui/gui.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/gui/gui.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
|
+#endif
|
||||||
diff --git a/qtbase/include/QtGui/qtgui-config.h b/qtbase/include/QtGui/qtgui-config.h
|
diff --git a/qtbase/include/QtGui/qtgui-config.h b/qtbase/include/QtGui/qtgui-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..81638f1
|
index 0000000..81638f1
|
||||||
@ -161,21 +89,30 @@ index 0000000..81638f1
|
|||||||
+++ b/qtbase/include/QtGui/qtgui-config.h
|
+++ b/qtbase/include/QtGui/qtgui-config.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../src/gui/qtgui-config.h"
|
+#include "../../src/gui/qtgui-config.h"
|
||||||
diff --git a/qtbase/include/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h b/qtbase/include/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h
|
diff --git a/qtbase/include/QtGui/qvulkanfunctions.h b/qtbase/include/QtGui/qvulkanfunctions.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..55d5bab
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtGui/qvulkanfunctions.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "../../src/gui/vulkan/qvulkanfunctions.h"
|
||||||
|
diff --git a/qtbase/include/QtNetwork/5.13.0/QtNetwork/private/qtnetwork-config_p.h b/qtbase/include/QtNetwork/5.13.0/QtNetwork/private/qtnetwork-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..cbf4749
|
index 0000000..cbf4749
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h
|
+++ b/qtbase/include/QtNetwork/5.13.0/QtNetwork/private/qtnetwork-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/network/qtnetwork-config_p.h"
|
+#include "../../../../../src/network/qtnetwork-config_p.h"
|
||||||
diff --git a/qtbase/include/QtNetwork/QtNetworkDepends b/qtbase/include/QtNetwork/QtNetworkDepends
|
diff --git a/qtbase/include/QtNetwork/QtNetworkDepends b/qtbase/include/QtNetwork/QtNetworkDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..cb2c29d
|
index 0000000..511727a
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtNetwork/QtNetworkDepends
|
+++ b/qtbase/include/QtNetwork/QtNetworkDepends
|
||||||
@@ -0,0 +1,2 @@
|
@@ -0,0 +1,4 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/network/network.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/network/network.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
|
+#endif
|
||||||
diff --git a/qtbase/include/QtNetwork/qtnetwork-config.h b/qtbase/include/QtNetwork/qtnetwork-config.h
|
diff --git a/qtbase/include/QtNetwork/qtnetwork-config.h b/qtbase/include/QtNetwork/qtnetwork-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..c8cd7fb
|
index 0000000..c8cd7fb
|
||||||
@ -185,31 +122,35 @@ index 0000000..c8cd7fb
|
|||||||
+#include "../../src/network/qtnetwork-config.h"
|
+#include "../../src/network/qtnetwork-config.h"
|
||||||
diff --git a/qtbase/include/QtOpenGL/QtOpenGLDepends b/qtbase/include/QtOpenGL/QtOpenGLDepends
|
diff --git a/qtbase/include/QtOpenGL/QtOpenGLDepends b/qtbase/include/QtOpenGL/QtOpenGLDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..e15843d
|
index 0000000..d2d9d9f
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtOpenGL/QtOpenGLDepends
|
+++ b/qtbase/include/QtOpenGL/QtOpenGLDepends
|
||||||
@@ -0,0 +1,4 @@
|
@@ -0,0 +1,6 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/opengl/opengl.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/opengl/opengl.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
+#include <QtGui/QtGui>
|
+#include <QtGui/QtGui>
|
||||||
+#include <QtWidgets/QtWidgets>
|
+#include <QtWidgets/QtWidgets>
|
||||||
diff --git a/qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h b/qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h
|
+#endif
|
||||||
|
diff --git a/qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport/private/qtprintsupport-config_p.h b/qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport/private/qtprintsupport-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..7833b12
|
index 0000000..7833b12
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h
|
+++ b/qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport/private/qtprintsupport-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/printsupport/qtprintsupport-config_p.h"
|
+#include "../../../../../src/printsupport/qtprintsupport-config_p.h"
|
||||||
diff --git a/qtbase/include/QtPrintSupport/QtPrintSupportDepends b/qtbase/include/QtPrintSupport/QtPrintSupportDepends
|
diff --git a/qtbase/include/QtPrintSupport/QtPrintSupportDepends b/qtbase/include/QtPrintSupport/QtPrintSupportDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..520b700
|
index 0000000..5894583
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtPrintSupport/QtPrintSupportDepends
|
+++ b/qtbase/include/QtPrintSupport/QtPrintSupportDepends
|
||||||
@@ -0,0 +1,4 @@
|
@@ -0,0 +1,6 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/printsupport/printsupport.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/printsupport/printsupport.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
+#include <QtGui/QtGui>
|
+#include <QtGui/QtGui>
|
||||||
+#include <QtWidgets/QtWidgets>
|
+#include <QtWidgets/QtWidgets>
|
||||||
|
+#endif
|
||||||
diff --git a/qtbase/include/QtPrintSupport/qtprintsupport-config.h b/qtbase/include/QtPrintSupport/qtprintsupport-config.h
|
diff --git a/qtbase/include/QtPrintSupport/qtprintsupport-config.h b/qtbase/include/QtPrintSupport/qtprintsupport-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..747e599
|
index 0000000..747e599
|
||||||
@ -217,14 +158,37 @@ index 0000000..747e599
|
|||||||
+++ b/qtbase/include/QtPrintSupport/qtprintsupport-config.h
|
+++ b/qtbase/include/QtPrintSupport/qtprintsupport-config.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../src/printsupport/qtprintsupport-config.h"
|
+#include "../../src/printsupport/qtprintsupport-config.h"
|
||||||
|
diff --git a/qtbase/include/QtSql/5.13.0/QtSql/private/qtsql-config_p.h b/qtbase/include/QtSql/5.13.0/QtSql/private/qtsql-config_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ffef37b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtSql/5.13.0/QtSql/private/qtsql-config_p.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "../../../../../src/sql/qtsql-config_p.h"
|
||||||
diff --git a/qtbase/include/QtSql/QtSqlDepends b/qtbase/include/QtSql/QtSqlDepends
|
diff --git a/qtbase/include/QtSql/QtSqlDepends b/qtbase/include/QtSql/QtSqlDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..42eb220
|
index 0000000..bba20a6
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtSql/QtSqlDepends
|
+++ b/qtbase/include/QtSql/QtSqlDepends
|
||||||
@@ -0,0 +1,2 @@
|
@@ -0,0 +1,4 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/sql/sql.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/sql/sql.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
|
+#endif
|
||||||
|
diff --git a/qtbase/include/QtSql/qtsql-config.h b/qtbase/include/QtSql/qtsql-config.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..fa917d5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtSql/qtsql-config.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "../../src/sql/qtsql-config.h"
|
||||||
|
diff --git a/qtbase/include/QtTest/5.13.0/QtTest/private/qttestlib-config_p.h b/qtbase/include/QtTest/5.13.0/QtTest/private/qttestlib-config_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..6e5b899
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtTest/5.13.0/QtTest/private/qttestlib-config_p.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "../../../../../src/testlib/qttestlib-config_p.h"
|
||||||
diff --git a/qtbase/include/QtTest/QtTestDepends b/qtbase/include/QtTest/QtTestDepends
|
diff --git a/qtbase/include/QtTest/QtTestDepends b/qtbase/include/QtTest/QtTestDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..64e448e
|
index 0000000..64e448e
|
||||||
@ -235,22 +199,31 @@ index 0000000..64e448e
|
|||||||
+#ifdef __cplusplus /* create empty PCH in C mode */
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
+#endif
|
+#endif
|
||||||
diff --git a/qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h b/qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h
|
diff --git a/qtbase/include/QtTest/qttestlib-config.h b/qtbase/include/QtTest/qttestlib-config.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ec1c9e6
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/include/QtTest/qttestlib-config.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include "../../src/testlib/qttestlib-config.h"
|
||||||
|
diff --git a/qtbase/include/QtWidgets/5.13.0/QtWidgets/private/qtwidgets-config_p.h b/qtbase/include/QtWidgets/5.13.0/QtWidgets/private/qtwidgets-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..9a6332d
|
index 0000000..9a6332d
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h
|
+++ b/qtbase/include/QtWidgets/5.13.0/QtWidgets/private/qtwidgets-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/widgets/qtwidgets-config_p.h"
|
+#include "../../../../../src/widgets/qtwidgets-config_p.h"
|
||||||
diff --git a/qtbase/include/QtWidgets/QtWidgetsDepends b/qtbase/include/QtWidgets/QtWidgetsDepends
|
diff --git a/qtbase/include/QtWidgets/QtWidgetsDepends b/qtbase/include/QtWidgets/QtWidgetsDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..03776b6
|
index 0000000..80cfcaf
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtWidgets/QtWidgetsDepends
|
+++ b/qtbase/include/QtWidgets/QtWidgetsDepends
|
||||||
@@ -0,0 +1,3 @@
|
@@ -0,0 +1,5 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/widgets/widgets.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/widgets/widgets.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
+#include <QtGui/QtGui>
|
+#include <QtGui/QtGui>
|
||||||
|
+#endif
|
||||||
diff --git a/qtbase/include/QtWidgets/qtwidgets-config.h b/qtbase/include/QtWidgets/qtwidgets-config.h
|
diff --git a/qtbase/include/QtWidgets/qtwidgets-config.h b/qtbase/include/QtWidgets/qtwidgets-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..09179b0
|
index 0000000..09179b0
|
||||||
@ -258,21 +231,23 @@ index 0000000..09179b0
|
|||||||
+++ b/qtbase/include/QtWidgets/qtwidgets-config.h
|
+++ b/qtbase/include/QtWidgets/qtwidgets-config.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../src/widgets/qtwidgets-config.h"
|
+#include "../../src/widgets/qtwidgets-config.h"
|
||||||
diff --git a/qtbase/include/QtXml/5.8.0/QtXml/private/qtxml-config_p.h b/qtbase/include/QtXml/5.8.0/QtXml/private/qtxml-config_p.h
|
diff --git a/qtbase/include/QtXml/5.13.0/QtXml/private/qtxml-config_p.h b/qtbase/include/QtXml/5.13.0/QtXml/private/qtxml-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..d567490
|
index 0000000..d567490
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtXml/5.8.0/QtXml/private/qtxml-config_p.h
|
+++ b/qtbase/include/QtXml/5.13.0/QtXml/private/qtxml-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/xml/qtxml-config_p.h"
|
+#include "../../../../../src/xml/qtxml-config_p.h"
|
||||||
diff --git a/qtbase/include/QtXml/QtXmlDepends b/qtbase/include/QtXml/QtXmlDepends
|
diff --git a/qtbase/include/QtXml/QtXmlDepends b/qtbase/include/QtXml/QtXmlDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..39dd8ec
|
index 0000000..9ce6bbb
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/include/QtXml/QtXmlDepends
|
+++ b/qtbase/include/QtXml/QtXmlDepends
|
||||||
@@ -0,0 +1,2 @@
|
@@ -0,0 +1,4 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/xml/xml.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/xml/xml.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
|
+#endif
|
||||||
diff --git a/qtbase/include/QtXml/qtxml-config.h b/qtbase/include/QtXml/qtxml-config.h
|
diff --git a/qtbase/include/QtXml/qtxml-config.h b/qtbase/include/QtXml/qtxml-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..602a176
|
index 0000000..602a176
|
||||||
@ -282,24 +257,40 @@ index 0000000..602a176
|
|||||||
+#include "../../src/xml/qtxml-config.h"
|
+#include "../../src/xml/qtxml-config.h"
|
||||||
diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp
|
diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..7068d65
|
index 0000000..a123483
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/corelib/global/qconfig.cpp
|
+++ b/qtbase/src/corelib/global/qconfig.cpp
|
||||||
@@ -0,0 +1,51 @@
|
@@ -0,0 +1,65 @@
|
||||||
+/* Installation date */
|
+/* Installation date */
|
||||||
+static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
|
+static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
|
||||||
+
|
|
||||||
+/* Installation Info */
|
+/* Installation Info */
|
||||||
+static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=/qt";
|
+static const char qt_configure_prefix_path_str [12+256] = "qt_prfxpath=/usr/local/Qt-5.13.0";
|
||||||
+#ifdef QT_BUILD_QMAKE
|
+#ifdef QT_BUILD_QMAKE
|
||||||
+static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=";
|
+static const char qt_configure_ext_prefix_path_str [12+256] = "qt_epfxpath=/usr/local/Qt-5.13.0";
|
||||||
+static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=";
|
+static const char qt_configure_host_prefix_path_str [12+256] = "qt_hpfxpath=/usr/local/Qt-5.13.0";
|
||||||
+#endif
|
+#endif
|
||||||
+
|
|
||||||
+static const short qt_configure_str_offsets[] = {
|
+static const short qt_configure_str_offsets[] = {
|
||||||
+ 0, 4, 12, 16, 24, 28, 36, 44, 48, 50, 52, 65, 74,
|
+ 0,
|
||||||
|
+ 4,
|
||||||
|
+ 12,
|
||||||
|
+ 16,
|
||||||
|
+ 24,
|
||||||
|
+ 28,
|
||||||
|
+ 36,
|
||||||
|
+ 44,
|
||||||
|
+ 48,
|
||||||
|
+ 50,
|
||||||
|
+ 52,
|
||||||
|
+ 65,
|
||||||
|
+ 74,
|
||||||
+#ifdef QT_BUILD_QMAKE
|
+#ifdef QT_BUILD_QMAKE
|
||||||
+ 80, 81, 85, 89, 91, 101,
|
+ 80,
|
||||||
|
+ 81,
|
||||||
|
+ 87,
|
||||||
|
+ 91,
|
||||||
|
+ 95,
|
||||||
|
+ 97,
|
||||||
|
+ 107,
|
||||||
+#endif
|
+#endif
|
||||||
+};
|
+};
|
||||||
+static const char qt_configure_strs[] =
|
+static const char qt_configure_strs[] =
|
||||||
@ -318,6 +309,7 @@ index 0000000..7068d65
|
|||||||
+ "tests\0"
|
+ "tests\0"
|
||||||
+#ifdef QT_BUILD_QMAKE
|
+#ifdef QT_BUILD_QMAKE
|
||||||
+ "\0"
|
+ "\0"
|
||||||
|
+ "false\0"
|
||||||
+ "bin\0"
|
+ "bin\0"
|
||||||
+ "lib\0"
|
+ "lib\0"
|
||||||
+ ".\0"
|
+ ".\0"
|
||||||
@ -325,13 +317,10 @@ index 0000000..7068d65
|
|||||||
+ "linux-g++\0"
|
+ "linux-g++\0"
|
||||||
+#endif
|
+#endif
|
||||||
+;
|
+;
|
||||||
+
|
|
||||||
+#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg"
|
+#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg"
|
||||||
+
|
|
||||||
+#ifdef QT_BUILD_QMAKE
|
+#ifdef QT_BUILD_QMAKE
|
||||||
+# define QT_CONFIGURE_SYSROOTIFY_PREFIX false
|
+# define QT_CONFIGURE_SYSROOTIFY_PREFIX false
|
||||||
+#endif
|
+#endif
|
||||||
+
|
|
||||||
+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12
|
+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12
|
||||||
+#ifdef QT_BUILD_QMAKE
|
+#ifdef QT_BUILD_QMAKE
|
||||||
+# define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12
|
+# define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12
|
||||||
@ -339,64 +328,89 @@ index 0000000..7068d65
|
|||||||
+#endif
|
+#endif
|
||||||
diff --git a/qtbase/src/corelib/global/qconfig.h b/qtbase/src/corelib/global/qconfig.h
|
diff --git a/qtbase/src/corelib/global/qconfig.h b/qtbase/src/corelib/global/qconfig.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..8a37dbf
|
index 0000000..8170f78
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/corelib/global/qconfig.h
|
+++ b/qtbase/src/corelib/global/qconfig.h
|
||||||
@@ -0,0 +1,24 @@
|
@@ -0,0 +1,33 @@
|
||||||
|
+#define QT_FEATURE_cross_compile -1
|
||||||
+#define QT_FEATURE_framework -1
|
+#define QT_FEATURE_framework -1
|
||||||
+#define QT_FEATURE_shared 1
|
+#define QT_FEATURE_shared 1
|
||||||
+#define QT_FEATURE_rpath 1
|
+#define QT_FEATURE_rpath 1
|
||||||
+#define QT_FEATURE_accessibility -1
|
+#define QT_COMPILER_SUPPORTS_SSE2 1
|
||||||
+# define QT_NO_ACCESSIBILITY
|
+#define QT_COMPILER_SUPPORTS_AES 1
|
||||||
|
+#define QT_FEATURE_appstore_compliant -1
|
||||||
+#define QT_FEATURE_debug_and_release -1
|
+#define QT_FEATURE_debug_and_release -1
|
||||||
+#define QT_FEATURE_simulator_and_device -1
|
+#define QT_FEATURE_simulator_and_device -1
|
||||||
+#define QT_FEATURE_build_all -1
|
+#define QT_FEATURE_build_all -1
|
||||||
+#define QT_FEATURE_c__11 1
|
+#define QT_FEATURE_c__11 1
|
||||||
+#define QT_FEATURE_c__14 -1
|
+#define QT_FEATURE_c__14 1
|
||||||
+#define QT_FEATURE_c__1z -1
|
+#define QT_FEATURE_c__1z -1
|
||||||
|
+#define QT_FEATURE_c__2a -1
|
||||||
|
+#define QT_FEATURE_c99 1
|
||||||
|
+#define QT_FEATURE_c11 1
|
||||||
|
+#define QT_FEATURE_thread 1
|
||||||
|
+#define QT_FEATURE_future 1
|
||||||
+#define QT_FEATURE_concurrent 1
|
+#define QT_FEATURE_concurrent 1
|
||||||
+#define QT_NO_DBUS
|
+#define QT_NO_DBUS
|
||||||
+#define QT_FEATURE_force_asserts -1
|
+#define QT_FEATURE_force_asserts -1
|
||||||
+#define QT_FEATURE_pkg_config 1
|
+#define QT_FEATURE_pkg_config 1
|
||||||
+#define QT_LARGEFILE_SUPPORT 64
|
+#define QT_LARGEFILE_SUPPORT 64
|
||||||
|
+#define QT_COMPILER_SUPPORTS_RDRND 1
|
||||||
+#define QT_VISIBILITY_AVAILABLE true
|
+#define QT_VISIBILITY_AVAILABLE true
|
||||||
+#define QT_FEATURE_separate_debug_info -1
|
+#define QT_FEATURE_separate_debug_info -1
|
||||||
+#define QT_COMPILER_SUPPORTS_SSE2 1
|
+#define QT_COMPILER_SUPPORTS_SHA 1
|
||||||
+#define QT_FEATURE_static -1
|
+#define QT_FEATURE_static -1
|
||||||
+#define QT_VERSION_STR "5.8.0"
|
+#define QT_COMPILER_SUPPORTS_SIMD_ALWAYS 1
|
||||||
|
+#define QT_VERSION_STR "5.13.0"
|
||||||
+#define QT_VERSION_MAJOR 5
|
+#define QT_VERSION_MAJOR 5
|
||||||
+#define QT_VERSION_MINOR 8
|
+#define QT_VERSION_MINOR 13
|
||||||
+#define QT_VERSION_PATCH 0
|
+#define QT_VERSION_PATCH 0
|
||||||
diff --git a/qtbase/src/corelib/global/qconfig_p.h b/qtbase/src/corelib/global/qconfig_p.h
|
diff --git a/qtbase/src/corelib/global/qconfig_p.h b/qtbase/src/corelib/global/qconfig_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..f5f76cf
|
index 0000000..75c3455
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/corelib/global/qconfig_p.h
|
+++ b/qtbase/src/corelib/global/qconfig_p.h
|
||||||
@@ -0,0 +1,12 @@
|
@@ -0,0 +1,24 @@
|
||||||
+#define QT_FEATURE_private_tests -1
|
+#define QT_FEATURE_private_tests -1
|
||||||
|
+#define QT_FEATURE_sse2 1
|
||||||
|
+#define QT_FEATURE_alloca -1
|
||||||
|
+#define QT_FEATURE_alloca_h -1
|
||||||
|
+#define QT_FEATURE_alloca_malloc_h -1
|
||||||
|
+#define QT_FEATURE_android_style_assets -1
|
||||||
|
+#define QT_FEATURE_avx2 -1
|
||||||
+#define QT_FEATURE_dbus -1
|
+#define QT_FEATURE_dbus -1
|
||||||
+#define QT_FEATURE_dbus_linked -1
|
+#define QT_FEATURE_dbus_linked -1
|
||||||
|
+#define QT_FEATURE_gc_binaries -1
|
||||||
+#define QT_FEATURE_gui 1
|
+#define QT_FEATURE_gui 1
|
||||||
+#define QT_FEATURE_libudev -1
|
+#define QT_FEATURE_libudev -1
|
||||||
|
+#define QT_FEATURE_network 1
|
||||||
+#define QT_FEATURE_posix_fallocate 1
|
+#define QT_FEATURE_posix_fallocate 1
|
||||||
+#define QT_FEATURE_reduce_exports 1
|
+#define QT_FEATURE_reduce_exports 1
|
||||||
+#define QT_FEATURE_reduce_relocations -1
|
+#define QT_FEATURE_reduce_relocations -1
|
||||||
+#define QT_FEATURE_release_tools -1
|
+#define QT_FEATURE_release_tools -1
|
||||||
+#define QT_FEATURE_sse2 1
|
+#define QT_FEATURE_sql 1
|
||||||
|
+#define QT_FEATURE_stack_protector_strong -1
|
||||||
+#define QT_FEATURE_system_zlib 1
|
+#define QT_FEATURE_system_zlib 1
|
||||||
|
+#define QT_FEATURE_testlib 1
|
||||||
+#define QT_FEATURE_widgets 1
|
+#define QT_FEATURE_widgets 1
|
||||||
|
+#define QT_FEATURE_xml 1
|
||||||
|
+#define QT_FEATURE_zstd -1
|
||||||
diff --git a/qtbase/src/corelib/qtcore-config.h b/qtbase/src/corelib/qtcore-config.h
|
diff --git a/qtbase/src/corelib/qtcore-config.h b/qtbase/src/corelib/qtcore-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..9fda215
|
index 0000000..347aa7f
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/corelib/qtcore-config.h
|
+++ b/qtbase/src/corelib/qtcore-config.h
|
||||||
@@ -0,0 +1,39 @@
|
@@ -0,0 +1,44 @@
|
||||||
+#define QT_FEATURE_properties 1
|
+#define QT_FEATURE_properties 1
|
||||||
+#define QT_FEATURE_animation 1
|
+#define QT_FEATURE_animation 1
|
||||||
+#define QT_FEATURE_textcodec 1
|
+#define QT_FEATURE_textcodec 1
|
||||||
+#define QT_FEATURE_big_codecs 1
|
+#define QT_FEATURE_big_codecs 1
|
||||||
+#define QT_FEATURE_codecs 1
|
+#define QT_FEATURE_codecs 1
|
||||||
+#define QT_FEATURE_commandlineparser 1
|
+#define QT_FEATURE_commandlineparser 1
|
||||||
|
+#define QT_FEATURE_itemmodel 1
|
||||||
|
+#define QT_FEATURE_proxymodel 1
|
||||||
|
+#define QT_FEATURE_concatenatetablesproxymodel 1
|
||||||
|
+#define QT_FEATURE_cxx11_future -1
|
||||||
+#define QT_FEATURE_textdate 1
|
+#define QT_FEATURE_textdate 1
|
||||||
+#define QT_FEATURE_datestring 1
|
+#define QT_FEATURE_datestring 1
|
||||||
+#define QT_NO_EVENTFD
|
+#define QT_NO_EVENTFD
|
||||||
@ -405,14 +419,13 @@ index 0000000..9fda215
|
|||||||
+#define QT_FEATURE_gestures 1
|
+#define QT_FEATURE_gestures 1
|
||||||
+#define QT_NO_GLIB
|
+#define QT_NO_GLIB
|
||||||
+#define QT_NO_ICONV
|
+#define QT_NO_ICONV
|
||||||
+#define QT_FEATURE_itemmodel 1
|
|
||||||
+#define QT_FEATURE_proxymodel 1
|
|
||||||
+#define QT_FEATURE_identityproxymodel 1
|
+#define QT_FEATURE_identityproxymodel 1
|
||||||
+#define QT_NO_INOTIFY
|
+#define QT_NO_INOTIFY
|
||||||
+#define QT_FEATURE_library 1
|
+#define QT_FEATURE_library 1
|
||||||
+#define QT_FEATURE_mimetype 1
|
+#define QT_FEATURE_mimetype 1
|
||||||
+#define QT_FEATURE_process -1
|
+#define QT_FEATURE_process -1
|
||||||
+#define QT_NO_PROCESS
|
+#define QT_NO_PROCESS
|
||||||
|
+#define QT_FEATURE_processenvironment 1
|
||||||
+#define QT_FEATURE_statemachine 1
|
+#define QT_FEATURE_statemachine 1
|
||||||
+#define QT_FEATURE_qeventtransition 1
|
+#define QT_FEATURE_qeventtransition 1
|
||||||
+#define QT_FEATURE_regularexpression 1
|
+#define QT_FEATURE_regularexpression 1
|
||||||
@ -420,6 +433,7 @@ index 0000000..9fda215
|
|||||||
+#define QT_FEATURE_sharedmemory -1
|
+#define QT_FEATURE_sharedmemory -1
|
||||||
+#define QT_NO_SHAREDMEMORY
|
+#define QT_NO_SHAREDMEMORY
|
||||||
+#define QT_FEATURE_sortfilterproxymodel 1
|
+#define QT_FEATURE_sortfilterproxymodel 1
|
||||||
|
+#define QT_FEATURE_std_atomic64 1
|
||||||
+#define QT_FEATURE_stringlistmodel 1
|
+#define QT_FEATURE_stringlistmodel 1
|
||||||
+#define QT_FEATURE_systemsemaphore -1
|
+#define QT_FEATURE_systemsemaphore -1
|
||||||
+#define QT_NO_SYSTEMSEMAPHORE
|
+#define QT_NO_SYSTEMSEMAPHORE
|
||||||
@ -427,37 +441,60 @@ index 0000000..9fda215
|
|||||||
+#define QT_FEATURE_timezone 1
|
+#define QT_FEATURE_timezone 1
|
||||||
+#define QT_FEATURE_topleveldomain 1
|
+#define QT_FEATURE_topleveldomain 1
|
||||||
+#define QT_FEATURE_translation 1
|
+#define QT_FEATURE_translation 1
|
||||||
|
+#define QT_FEATURE_transposeproxymodel 1
|
||||||
+#define QT_FEATURE_xmlstream 1
|
+#define QT_FEATURE_xmlstream 1
|
||||||
+#define QT_FEATURE_xmlstreamreader 1
|
+#define QT_FEATURE_xmlstreamreader 1
|
||||||
+#define QT_FEATURE_xmlstreamwriter 1
|
+#define QT_FEATURE_xmlstreamwriter 1
|
||||||
diff --git a/qtbase/src/corelib/qtcore-config_p.h b/qtbase/src/corelib/qtcore-config_p.h
|
diff --git a/qtbase/src/corelib/qtcore-config_p.h b/qtbase/src/corelib/qtcore-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..67468d2
|
index 0000000..dc87c22
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/corelib/qtcore-config_p.h
|
+++ b/qtbase/src/corelib/qtcore-config_p.h
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,31 @@
|
||||||
+#define QT_FEATURE_clock_gettime 1
|
+#define QT_FEATURE_clock_gettime 1
|
||||||
|
+#define QT_FEATURE_datetimeparser 1
|
||||||
|
+#define QT_FEATURE_dlopen 1
|
||||||
+#define QT_FEATURE_doubleconversion 1
|
+#define QT_FEATURE_doubleconversion 1
|
||||||
|
+#define QT_FEATURE_etw -1
|
||||||
|
+#define QT_FEATURE_futimens -1
|
||||||
|
+#define QT_FEATURE_futimes -1
|
||||||
|
+#define QT_FEATURE_getauxval -1
|
||||||
|
+#define QT_FEATURE_getentropy -1
|
||||||
+#define QT_FEATURE_glib -1
|
+#define QT_FEATURE_glib -1
|
||||||
|
+#define QT_FEATURE_glibc 1
|
||||||
+#define QT_FEATURE_gnu_libiconv -1
|
+#define QT_FEATURE_gnu_libiconv -1
|
||||||
+#define QT_FEATURE_iconv -1
|
+#define QT_FEATURE_iconv -1
|
||||||
+#define QT_FEATURE_icu -1
|
+#define QT_FEATURE_icu -1
|
||||||
+#define QT_FEATURE_inotify -1
|
+#define QT_FEATURE_inotify -1
|
||||||
+#define QT_FEATURE_libatomic -1
|
+#define QT_FEATURE_journald -1
|
||||||
|
+#define QT_FEATURE_linkat 1
|
||||||
|
+#define QT_FEATURE_lttng -1
|
||||||
|
+#define QT_FEATURE_mimetype_database 1
|
||||||
+#define QT_FEATURE_poll_ppoll -1
|
+#define QT_FEATURE_poll_ppoll -1
|
||||||
+#define QT_FEATURE_poll_pollts -1
|
+#define QT_FEATURE_poll_pollts -1
|
||||||
+#define QT_FEATURE_poll_poll 1
|
+#define QT_FEATURE_poll_poll 1
|
||||||
+#define QT_FEATURE_poll_select -1
|
+#define QT_FEATURE_poll_select -1
|
||||||
+#define QT_FEATURE_posix_libiconv -1
|
+#define QT_FEATURE_posix_libiconv -1
|
||||||
|
+#define QT_FEATURE_renameat2 -1
|
||||||
+#define QT_FEATURE_sha3_fast 1
|
+#define QT_FEATURE_sha3_fast 1
|
||||||
|
+#define QT_FEATURE_slog2 -1
|
||||||
|
+#define QT_FEATURE_statx -1
|
||||||
|
+#define QT_FEATURE_syslog -1
|
||||||
+#define QT_FEATURE_system_doubleconversion -1
|
+#define QT_FEATURE_system_doubleconversion -1
|
||||||
+#define QT_FEATURE_system_pcre -1
|
+#define QT_FEATURE_system_pcre2 -1
|
||||||
|
diff --git a/qtbase/src/corelib/qtcore_tracepoints_p.h b/qtbase/src/corelib/qtcore_tracepoints_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ff8d101
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/src/corelib/qtcore_tracepoints_p.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include <private/qtrace_p.h>
|
||||||
diff --git a/qtbase/src/gui/qtgui-config.h b/qtbase/src/gui/qtgui-config.h
|
diff --git a/qtbase/src/gui/qtgui-config.h b/qtbase/src/gui/qtgui-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..608c641
|
index 0000000..7444e61
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/gui/qtgui-config.h
|
+++ b/qtbase/src/gui/qtgui-config.h
|
||||||
@@ -0,0 +1,43 @@
|
@@ -0,0 +1,49 @@
|
||||||
+#define QT_FEATURE_accessibility -1
|
+#define QT_FEATURE_accessibility -1
|
||||||
+#define QT_NO_ACCESSIBILITY
|
+#define QT_NO_ACCESSIBILITY
|
||||||
+#define QT_NO_ACCESSIBILITY_ATSPI_BRIDGE
|
+#define QT_NO_ACCESSIBILITY_ATSPI_BRIDGE
|
||||||
@ -467,13 +504,16 @@ index 0000000..608c641
|
|||||||
+#define QT_FEATURE_angle -1
|
+#define QT_FEATURE_angle -1
|
||||||
+#define QT_FEATURE_clipboard 1
|
+#define QT_FEATURE_clipboard 1
|
||||||
+#define QT_FEATURE_colornames 1
|
+#define QT_FEATURE_colornames 1
|
||||||
|
+#define QT_FEATURE_combined_angle_lib -1
|
||||||
+#define QT_FEATURE_cssparser 1
|
+#define QT_FEATURE_cssparser 1
|
||||||
+#define QT_FEATURE_cursor 1
|
+#define QT_FEATURE_cursor 1
|
||||||
+#define QT_FEATURE_desktopservices 1
|
+#define QT_FEATURE_desktopservices 1
|
||||||
+#define QT_FEATURE_imageformat_xpm 1
|
+#define QT_FEATURE_imageformat_xpm 1
|
||||||
+#define QT_FEATURE_draganddrop 1
|
+#define QT_FEATURE_draganddrop 1
|
||||||
+#define QT_FEATURE_opengl 1
|
+#define QT_FEATURE_opengl 1
|
||||||
|
+#define QT_NO_EGL
|
||||||
+#define QT_NO_FONTCONFIG
|
+#define QT_NO_FONTCONFIG
|
||||||
|
+#define QT_FEATURE_imageformatplugin 1
|
||||||
+#define QT_NO_HARFBUZZ
|
+#define QT_NO_HARFBUZZ
|
||||||
+#define QT_FEATURE_highdpiscaling 1
|
+#define QT_FEATURE_highdpiscaling 1
|
||||||
+#define QT_FEATURE_im 1
|
+#define QT_FEATURE_im 1
|
||||||
@ -484,13 +524,14 @@ index 0000000..608c641
|
|||||||
+#define QT_FEATURE_imageformat_png 1
|
+#define QT_FEATURE_imageformat_png 1
|
||||||
+#define QT_FEATURE_imageformat_ppm 1
|
+#define QT_FEATURE_imageformat_ppm 1
|
||||||
+#define QT_FEATURE_imageformat_xbm 1
|
+#define QT_FEATURE_imageformat_xbm 1
|
||||||
+#define QT_FEATURE_imageformatplugin 1
|
|
||||||
+#define QT_FEATURE_movie 1
|
+#define QT_FEATURE_movie 1
|
||||||
+#define QT_FEATURE_opengles3 -1
|
+#define QT_FEATURE_opengles3 -1
|
||||||
+#define QT_FEATURE_opengles31 -1
|
+#define QT_FEATURE_opengles31 -1
|
||||||
|
+#define QT_FEATURE_opengles32 -1
|
||||||
|
+#define QT_FEATURE_openvg -1
|
||||||
+#define QT_FEATURE_pdf 1
|
+#define QT_FEATURE_pdf 1
|
||||||
+#define QT_FEATURE_picture 1
|
+#define QT_FEATURE_picture 1
|
||||||
+#define QT_QPA_DEFAULT_PLATFORM_NAME "nitpicker"
|
+#define QT_QPA_DEFAULT_PLATFORM_NAME "minimal"
|
||||||
+#define QT_FEATURE_sessionmanager -1
|
+#define QT_FEATURE_sessionmanager -1
|
||||||
+#define QT_NO_SESSIONMANAGER
|
+#define QT_NO_SESSIONMANAGER
|
||||||
+#define QT_FEATURE_shortcut 1
|
+#define QT_FEATURE_shortcut 1
|
||||||
@ -500,26 +541,40 @@ index 0000000..608c641
|
|||||||
+#define QT_FEATURE_texthtmlparser 1
|
+#define QT_FEATURE_texthtmlparser 1
|
||||||
+#define QT_FEATURE_textodfwriter 1
|
+#define QT_FEATURE_textodfwriter 1
|
||||||
+#define QT_FEATURE_validator 1
|
+#define QT_FEATURE_validator 1
|
||||||
|
+#define QT_FEATURE_vulkan -1
|
||||||
|
+#define QT_FEATURE_whatsthis 1
|
||||||
+#define QT_FEATURE_wheelevent 1
|
+#define QT_FEATURE_wheelevent 1
|
||||||
diff --git a/qtbase/src/gui/qtgui-config_p.h b/qtbase/src/gui/qtgui-config_p.h
|
diff --git a/qtbase/src/gui/qtgui-config_p.h b/qtbase/src/gui/qtgui-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..937a626
|
index 0000000..00840bf
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/gui/qtgui-config_p.h
|
+++ b/qtbase/src/gui/qtgui-config_p.h
|
||||||
@@ -0,0 +1,40 @@
|
@@ -0,0 +1,55 @@
|
||||||
+#define QT_FEATURE_accessibility_atspi_bridge -1
|
+#define QT_FEATURE_accessibility_atspi_bridge -1
|
||||||
+#define QT_FEATURE_android_style_assets -1
|
+#define QT_FEATURE_angle_d3d11_qdtd -1
|
||||||
+#define QT_FEATURE_direct2d -1
|
+#define QT_FEATURE_direct2d -1
|
||||||
|
+#define QT_FEATURE_direct2d1_1 -1
|
||||||
|
+#define QT_FEATURE_dxgi -1
|
||||||
|
+#define QT_FEATURE_direct3d11 -1
|
||||||
|
+#define QT_FEATURE_direct3d11_1 -1
|
||||||
|
+#define QT_FEATURE_direct3d9 -1
|
||||||
+#define QT_FEATURE_directfb -1
|
+#define QT_FEATURE_directfb -1
|
||||||
+#define QT_FEATURE_egl 1
|
+#define QT_FEATURE_drm_atomic 1
|
||||||
+#define QT_FEATURE_egl_x11 1
|
+#define QT_FEATURE_dxgi1_2 -1
|
||||||
+#define QT_FEATURE_eglfs 1
|
+#define QT_FEATURE_dxguid -1
|
||||||
|
+#define QT_FEATURE_egl -1
|
||||||
|
+#define QT_FEATURE_egl_x11 -1
|
||||||
|
+#define QT_FEATURE_eglfs -1
|
||||||
+#define QT_FEATURE_eglfs_brcm -1
|
+#define QT_FEATURE_eglfs_brcm -1
|
||||||
+#define QT_FEATURE_eglfs_egldevice -1
|
+#define QT_FEATURE_eglfs_egldevice -1
|
||||||
+#define QT_FEATURE_eglfs_gbm -1
|
+#define QT_FEATURE_eglfs_gbm -1
|
||||||
+#define QT_FEATURE_eglfs_mali -1
|
+#define QT_FEATURE_eglfs_mali -1
|
||||||
|
+#define QT_FEATURE_eglfs_openwfd -1
|
||||||
|
+#define QT_FEATURE_eglfs_rcar -1
|
||||||
+#define QT_FEATURE_eglfs_viv -1
|
+#define QT_FEATURE_eglfs_viv -1
|
||||||
+#define QT_FEATURE_eglfs_viv_wl -1
|
+#define QT_FEATURE_eglfs_viv_wl -1
|
||||||
|
+#define QT_FEATURE_eglfs_vsp2 -1
|
||||||
|
+#define QT_FEATURE_eglfs_x11 -1
|
||||||
+#define QT_FEATURE_evdev 1
|
+#define QT_FEATURE_evdev 1
|
||||||
+#define QT_FEATURE_fontconfig -1
|
+#define QT_FEATURE_fontconfig -1
|
||||||
+#define QT_FEATURE_freetype 1
|
+#define QT_FEATURE_freetype 1
|
||||||
@ -527,7 +582,9 @@ index 0000000..937a626
|
|||||||
+#define QT_FEATURE_harfbuzz -1
|
+#define QT_FEATURE_harfbuzz -1
|
||||||
+#define QT_FEATURE_ico 1
|
+#define QT_FEATURE_ico 1
|
||||||
+#define QT_FEATURE_integrityfb -1
|
+#define QT_FEATURE_integrityfb -1
|
||||||
|
+#define QT_FEATURE_integrityhid -1
|
||||||
+#define QT_FEATURE_jpeg 1
|
+#define QT_FEATURE_jpeg 1
|
||||||
|
+#define QT_FEATURE_kms 1
|
||||||
+#define QT_FEATURE_libinput -1
|
+#define QT_FEATURE_libinput -1
|
||||||
+#define QT_FEATURE_libinput_axis_api -1
|
+#define QT_FEATURE_libinput_axis_api -1
|
||||||
+#define QT_FEATURE_linuxfb 1
|
+#define QT_FEATURE_linuxfb 1
|
||||||
@ -539,31 +596,44 @@ index 0000000..937a626
|
|||||||
+#define QT_FEATURE_system_harfbuzz -1
|
+#define QT_FEATURE_system_harfbuzz -1
|
||||||
+#define QT_FEATURE_system_jpeg 1
|
+#define QT_FEATURE_system_jpeg 1
|
||||||
+#define QT_FEATURE_system_png 1
|
+#define QT_FEATURE_system_png 1
|
||||||
|
+#define QT_FEATURE_xcb -1
|
||||||
+#define QT_FEATURE_system_xcb -1
|
+#define QT_FEATURE_system_xcb -1
|
||||||
+#define QT_FEATURE_tslib -1
|
+#define QT_FEATURE_tslib -1
|
||||||
+#define QT_FEATURE_xcb -1
|
+#define QT_FEATURE_tuiotouch 1
|
||||||
+#define QT_FEATURE_xinput2 -1
|
+#define QT_FEATURE_vnc 1
|
||||||
+#define QT_FEATURE_xkb -1
|
+#define QT_FEATURE_vsp2 -1
|
||||||
+#define QT_FEATURE_xkbcommon_evdev -1
|
|
||||||
+#define QT_FEATURE_xlib 1
|
+#define QT_FEATURE_xlib 1
|
||||||
+#define QT_FEATURE_xrender 1
|
+#define QT_FEATURE_xcb_xlib 1
|
||||||
|
+#define QT_FEATURE_xkbcommon 1
|
||||||
|
diff --git a/qtbase/src/gui/qtgui_tracepoints_p.h b/qtbase/src/gui/qtgui_tracepoints_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ff8d101
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/src/gui/qtgui_tracepoints_p.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include <private/qtrace_p.h>
|
||||||
diff --git a/qtbase/src/network/qtnetwork-config.h b/qtbase/src/network/qtnetwork-config.h
|
diff --git a/qtbase/src/network/qtnetwork-config.h b/qtbase/src/network/qtnetwork-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..347fdb2
|
index 0000000..7989e9e
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/network/qtnetwork-config.h
|
+++ b/qtbase/src/network/qtnetwork-config.h
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,21 @@
|
||||||
+#define QT_FEATURE_networkinterface -1
|
+#define QT_FEATURE_networkinterface -1
|
||||||
+#define QT_NO_NETWORKINTERFACE
|
+#define QT_NO_NETWORKINTERFACE
|
||||||
+#define QT_FEATURE_bearermanagement -1
|
+#define QT_FEATURE_bearermanagement -1
|
||||||
+#define QT_NO_BEARERMANAGEMENT
|
+#define QT_NO_BEARERMANAGEMENT
|
||||||
|
+#define QT_FEATURE_dnslookup 1
|
||||||
|
+#define QT_FEATURE_schannel -1
|
||||||
|
+#define QT_LINKED_OPENSSL true
|
||||||
|
+#define QT_FEATURE_dtls 1
|
||||||
+#define QT_FEATURE_ftp 1
|
+#define QT_FEATURE_ftp 1
|
||||||
+#define QT_FEATURE_http 1
|
+#define QT_FEATURE_http 1
|
||||||
+#define QT_NO_IPV6IFNAME
|
+#define QT_NO_IPV6IFNAME
|
||||||
+#define QT_FEATURE_localserver 1
|
+#define QT_FEATURE_localserver 1
|
||||||
+#define QT_FEATURE_networkdiskcache 1
|
+#define QT_FEATURE_networkdiskcache 1
|
||||||
+#define QT_FEATURE_networkproxy 1
|
+#define QT_FEATURE_networkproxy 1
|
||||||
+#define QT_LINKED_OPENSSL true
|
+#define QT_FEATURE_opensslv11 -1
|
||||||
|
+#define QT_FEATURE_ocsp -1
|
||||||
+#define QT_FEATURE_sctp -1
|
+#define QT_FEATURE_sctp -1
|
||||||
+#define QT_NO_SCTP
|
+#define QT_NO_SCTP
|
||||||
+#define QT_FEATURE_socks5 1
|
+#define QT_FEATURE_socks5 1
|
||||||
@ -571,78 +641,66 @@ index 0000000..347fdb2
|
|||||||
+#define QT_FEATURE_udpsocket 1
|
+#define QT_FEATURE_udpsocket 1
|
||||||
diff --git a/qtbase/src/network/qtnetwork-config_p.h b/qtbase/src/network/qtnetwork-config_p.h
|
diff --git a/qtbase/src/network/qtnetwork-config_p.h b/qtbase/src/network/qtnetwork-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..a0676fb
|
index 0000000..ab87522
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/network/qtnetwork-config_p.h
|
+++ b/qtbase/src/network/qtnetwork-config_p.h
|
||||||
@@ -0,0 +1,5 @@
|
@@ -0,0 +1,6 @@
|
||||||
+#define QT_FEATURE_libproxy -1
|
|
||||||
+#define QT_FEATURE_securetransport -1
|
+#define QT_FEATURE_securetransport -1
|
||||||
+#define QT_FEATURE_openssl 1
|
|
||||||
+#define QT_FEATURE_openssl_linked 1
|
+#define QT_FEATURE_openssl_linked 1
|
||||||
|
+#define QT_FEATURE_openssl 1
|
||||||
|
+#define QT_FEATURE_libproxy -1
|
||||||
|
+#define QT_FEATURE_linux_netlink 1
|
||||||
+#define QT_FEATURE_system_proxies -1
|
+#define QT_FEATURE_system_proxies -1
|
||||||
diff --git a/qtbase/src/printsupport/qtprintsupport-config.h b/qtbase/src/printsupport/qtprintsupport-config.h
|
diff --git a/qtbase/src/printsupport/qtprintsupport-config.h b/qtbase/src/printsupport/qtprintsupport-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..31472cc
|
index 0000000..d1f24ca
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/printsupport/qtprintsupport-config.h
|
+++ b/qtbase/src/printsupport/qtprintsupport-config.h
|
||||||
@@ -0,0 +1,5 @@
|
@@ -0,0 +1,6 @@
|
||||||
+#define QT_NO_CUPS
|
+#define QT_NO_CUPS
|
||||||
|
+#define QT_NO_CUPSJOBWIDGET
|
||||||
+#define QT_FEATURE_printer 1
|
+#define QT_FEATURE_printer 1
|
||||||
+#define QT_FEATURE_printdialog 1
|
+#define QT_FEATURE_printdialog 1
|
||||||
+#define QT_FEATURE_printpreviewwidget 1
|
+#define QT_FEATURE_printpreviewwidget 1
|
||||||
+#define QT_FEATURE_printpreviewdialog 1
|
+#define QT_FEATURE_printpreviewdialog 1
|
||||||
diff --git a/qtbase/src/printsupport/qtprintsupport-config_p.h b/qtbase/src/printsupport/qtprintsupport-config_p.h
|
diff --git a/qtbase/src/printsupport/qtprintsupport-config_p.h b/qtbase/src/printsupport/qtprintsupport-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..ab4f4dd
|
index 0000000..dfe0a58
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/printsupport/qtprintsupport-config_p.h
|
+++ b/qtbase/src/printsupport/qtprintsupport-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1,2 @@
|
||||||
+#define QT_FEATURE_cups -1
|
+#define QT_FEATURE_cups -1
|
||||||
diff --git a/qtbase/src/sql/qtsql-config.h b/qtbase/src/sql/qtsql-config.h
|
+#define QT_FEATURE_cupsjobwidget -1
|
||||||
new file mode 100644
|
|
||||||
index 0000000..c4e6bef
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/qtbase/src/sql/qtsql-config.h
|
|
||||||
@@ -0,0 +1,9 @@
|
|
||||||
+#define QT_FEATURE_sql_db2 -1
|
|
||||||
+#define QT_FEATURE_sql_ibase -1
|
|
||||||
+#define QT_FEATURE_sql_mysql -1
|
|
||||||
+#define QT_FEATURE_sql_oci -1
|
|
||||||
+#define QT_FEATURE_sql_odbc -1
|
|
||||||
+#define QT_FEATURE_sql_psql -1
|
|
||||||
+#define QT_FEATURE_sql_sqlite 1
|
|
||||||
+#define QT_FEATURE_sql_sqlite2 -1
|
|
||||||
+#define QT_FEATURE_sql_tds -1
|
|
||||||
diff --git a/qtbase/src/sql/qtsql-config_p.h b/qtbase/src/sql/qtsql-config_p.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..9b40bf6
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/qtbase/src/sql/qtsql-config_p.h
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+#define QT_FEATURE_system_sqlite -1
|
|
||||||
diff --git a/qtbase/src/widgets/qtwidgets-config.h b/qtbase/src/widgets/qtwidgets-config.h
|
diff --git a/qtbase/src/widgets/qtwidgets-config.h b/qtbase/src/widgets/qtwidgets-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..dd8ef6e
|
index 0000000..3229c56
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/widgets/qtwidgets-config.h
|
+++ b/qtbase/src/widgets/qtwidgets-config.h
|
||||||
@@ -0,0 +1,68 @@
|
@@ -0,0 +1,78 @@
|
||||||
|
+#define QT_FEATURE_abstractbutton 1
|
||||||
|
+#define QT_FEATURE_abstractslider 1
|
||||||
+#define QT_FEATURE_groupbox 1
|
+#define QT_FEATURE_groupbox 1
|
||||||
+#define QT_FEATURE_buttongroup 1
|
+#define QT_FEATURE_buttongroup 1
|
||||||
+#define QT_FEATURE_rubberband 1
|
+#define QT_FEATURE_label 1
|
||||||
|
+#define QT_FEATURE_pushbutton 1
|
||||||
|
+#define QT_FEATURE_menu 1
|
||||||
|
+#define QT_FEATURE_lineedit 1
|
||||||
|
+#define QT_FEATURE_spinbox 1
|
||||||
+#define QT_FEATURE_slider 1
|
+#define QT_FEATURE_slider 1
|
||||||
+#define QT_FEATURE_scrollbar 1
|
+#define QT_FEATURE_scrollbar 1
|
||||||
+#define QT_FEATURE_scrollarea 1
|
+#define QT_FEATURE_scrollarea 1
|
||||||
+#define QT_FEATURE_itemviews 1
|
+#define QT_FEATURE_itemviews 1
|
||||||
+#define QT_FEATURE_tableview 1
|
+#define QT_FEATURE_tableview 1
|
||||||
+#define QT_FEATURE_menu 1
|
|
||||||
+#define QT_FEATURE_spinbox 1
|
|
||||||
+#define QT_FEATURE_toolbutton 1
|
+#define QT_FEATURE_toolbutton 1
|
||||||
+#define QT_FEATURE_calendarwidget 1
|
+#define QT_FEATURE_calendarwidget 1
|
||||||
|
+#define QT_FEATURE_checkbox 1
|
||||||
|
+#define QT_FEATURE_dialog 1
|
||||||
|
+#define QT_FEATURE_dialogbuttonbox 1
|
||||||
+#define QT_FEATURE_colordialog 1
|
+#define QT_FEATURE_colordialog 1
|
||||||
+#define QT_FEATURE_listview 1
|
+#define QT_FEATURE_listview 1
|
||||||
+#define QT_FEATURE_columnview 1
|
+#define QT_FEATURE_columnview 1
|
||||||
+#define QT_FEATURE_lineedit 1
|
|
||||||
+#define QT_FEATURE_combobox 1
|
+#define QT_FEATURE_combobox 1
|
||||||
|
+#define QT_FEATURE_commandlinkbutton 1
|
||||||
+#define QT_FEATURE_completer 1
|
+#define QT_FEATURE_completer 1
|
||||||
+#define QT_FEATURE_contextmenu 1
|
+#define QT_FEATURE_contextmenu 1
|
||||||
+#define QT_FEATURE_datawidgetmapper 1
|
+#define QT_FEATURE_datawidgetmapper 1
|
||||||
@ -655,13 +713,13 @@ index 0000000..dd8ef6e
|
|||||||
+#define QT_FEATURE_dockwidget 1
|
+#define QT_FEATURE_dockwidget 1
|
||||||
+#define QT_FEATURE_textedit 1
|
+#define QT_FEATURE_textedit 1
|
||||||
+#define QT_FEATURE_errormessage 1
|
+#define QT_FEATURE_errormessage 1
|
||||||
+#define QT_FEATURE_treeview 1
|
|
||||||
+#define QT_FEATURE_tooltip 1
|
|
||||||
+#define QT_FEATURE_splitter 1
|
+#define QT_FEATURE_splitter 1
|
||||||
+#define QT_FEATURE_stackedwidget 1
|
+#define QT_FEATURE_stackedwidget 1
|
||||||
|
+#define QT_FEATURE_treeview 1
|
||||||
+#define QT_FEATURE_filedialog 1
|
+#define QT_FEATURE_filedialog 1
|
||||||
+#define QT_FEATURE_fontcombobox 1
|
+#define QT_FEATURE_fontcombobox 1
|
||||||
+#define QT_FEATURE_fontdialog 1
|
+#define QT_FEATURE_fontdialog 1
|
||||||
|
+#define QT_FEATURE_formlayout 1
|
||||||
+#define QT_FEATURE_fscompleter 1
|
+#define QT_FEATURE_fscompleter 1
|
||||||
+#define QT_FEATURE_graphicsview 1
|
+#define QT_FEATURE_graphicsview 1
|
||||||
+#define QT_FEATURE_graphicseffect 1
|
+#define QT_FEATURE_graphicseffect 1
|
||||||
@ -675,6 +733,9 @@ index 0000000..dd8ef6e
|
|||||||
+#define QT_FEATURE_paint_debug 1
|
+#define QT_FEATURE_paint_debug 1
|
||||||
+#define QT_FEATURE_progressbar 1
|
+#define QT_FEATURE_progressbar 1
|
||||||
+#define QT_FEATURE_progressdialog 1
|
+#define QT_FEATURE_progressdialog 1
|
||||||
|
+#define QT_FEATURE_radiobutton 1
|
||||||
|
+#define QT_FEATURE_rubberband 1
|
||||||
|
+#define QT_FEATURE_scroller 1
|
||||||
+#define QT_FEATURE_sizegrip 1
|
+#define QT_FEATURE_sizegrip 1
|
||||||
+#define QT_FEATURE_splashscreen 1
|
+#define QT_FEATURE_splashscreen 1
|
||||||
+#define QT_FEATURE_statusbar 1
|
+#define QT_FEATURE_statusbar 1
|
||||||
@ -687,20 +748,34 @@ index 0000000..dd8ef6e
|
|||||||
+#define QT_FEATURE_textbrowser 1
|
+#define QT_FEATURE_textbrowser 1
|
||||||
+#define QT_FEATURE_toolbar 1
|
+#define QT_FEATURE_toolbar 1
|
||||||
+#define QT_FEATURE_toolbox 1
|
+#define QT_FEATURE_toolbox 1
|
||||||
|
+#define QT_FEATURE_tooltip 1
|
||||||
+#define QT_FEATURE_treewidget 1
|
+#define QT_FEATURE_treewidget 1
|
||||||
+#define QT_FEATURE_undocommand 1
|
+#define QT_FEATURE_undocommand 1
|
||||||
+#define QT_FEATURE_undostack 1
|
+#define QT_FEATURE_undostack 1
|
||||||
+#define QT_FEATURE_undogroup 1
|
+#define QT_FEATURE_undogroup 1
|
||||||
+#define QT_FEATURE_undoview 1
|
+#define QT_FEATURE_undoview 1
|
||||||
+#define QT_FEATURE_whatsthis 1
|
|
||||||
+#define QT_FEATURE_wizard 1
|
+#define QT_FEATURE_wizard 1
|
||||||
diff --git a/qtbase/src/widgets/qtwidgets-config_p.h b/qtbase/src/widgets/qtwidgets-config_p.h
|
diff --git a/qtbase/src/widgets/qtwidgets-config_p.h b/qtbase/src/widgets/qtwidgets-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..85a8761
|
index 0000000..bfdd43b
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtbase/src/widgets/qtwidgets-config_p.h
|
+++ b/qtbase/src/widgets/qtwidgets-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1,8 @@
|
||||||
|
+#define QT_FEATURE_widgettextcontrol 1
|
||||||
|
+#define QT_FEATURE_effects 1
|
||||||
+#define QT_FEATURE_gtk3 -1
|
+#define QT_FEATURE_gtk3 -1
|
||||||
|
+#define QT_FEATURE_style_android -1
|
||||||
|
+#define QT_FEATURE_style_fusion 1
|
||||||
|
+#define QT_FEATURE_style_mac -1
|
||||||
|
+#define QT_FEATURE_style_windows 1
|
||||||
|
+#define QT_FEATURE_style_windowsvista -1
|
||||||
|
diff --git a/qtbase/src/widgets/qtwidgets_tracepoints_p.h b/qtbase/src/widgets/qtwidgets_tracepoints_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ff8d101
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtbase/src/widgets/qtwidgets_tracepoints_p.h
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#include <private/qtrace_p.h>
|
||||||
diff --git a/qtbase/src/xml/qtxml-config.h b/qtbase/src/xml/qtxml-config.h
|
diff --git a/qtbase/src/xml/qtxml-config.h b/qtbase/src/xml/qtxml-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..163246e
|
index 0000000..163246e
|
||||||
|
@ -1,44 +1,12 @@
|
|||||||
qtbase_genode.patch
|
qtbase_genode.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
Genode-specific adaptations
|
Genode-specific adaptations
|
||||||
---
|
|
||||||
qtbase/src/corelib/codecs/qtextcodec.cpp | 4 +
|
|
||||||
qtbase/src/corelib/global/qcompilerdetection.h | 4 +
|
|
||||||
qtbase/src/corelib/global/qsystemdetection.h | 5 +-
|
|
||||||
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 | 7 +++
|
|
||||||
qtbase/src/corelib/kernel/qobject.h | 2 -
|
|
||||||
qtbase/src/corelib/kernel/qtranslator.cpp | 2 -
|
|
||||||
qtbase/src/corelib/thread/qthread.cpp | 4 +
|
|
||||||
qtbase/src/corelib/thread/qthread_p.h | 56 ++++++++++++++++++++
|
|
||||||
qtbase/src/corelib/tools/qdatetime.cpp | 3 +
|
|
||||||
qtbase/src/gui/image/qxpmhandler.cpp | 8 +++
|
|
||||||
qtbase/src/network/access/qhttpnetworkreply.cpp | 8 +++
|
|
||||||
.../network/access/qnetworkaccessfilebackend.cpp | 5 ++
|
|
||||||
qtbase/src/network/kernel/qhostinfo.cpp | 5 ++
|
|
||||||
qtbase/src/network/kernel/qhostinfo_unix.cpp | 7 ++-
|
|
||||||
.../network/socket/qnativesocketengine_unix.cpp | 16 ++++++
|
|
||||||
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 +
|
|
||||||
.../fontdatabases/basic/qbasicfontdatabase.cpp | 9 +++
|
|
||||||
.../evdevkeyboard/qevdevkeyboard_defaultmap_p.h | 4 +
|
|
||||||
.../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 17 ++++++
|
|
||||||
.../input/evdevkeyboard/qevdevkeyboardhandler_p.h | 2 +
|
|
||||||
qtbase/src/testlib/qtestcase.cpp | 2 -
|
|
||||||
qtbase/src/widgets/dialogs/qfiledialog.cpp | 2 -
|
|
||||||
qtbase/src/widgets/styles/qstylefactory.cpp | 7 +++
|
|
||||||
28 files changed, 197 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtbase/src/corelib/codecs/qtextcodec.cpp b/qtbase/src/corelib/codecs/qtextcodec.cpp
|
diff --git a/qtbase/src/corelib/codecs/qtextcodec.cpp b/qtbase/src/corelib/codecs/qtextcodec.cpp
|
||||||
index 0c9036a..0dac7c1 100644
|
index ffd8a2c..d40873a 100644
|
||||||
--- a/qtbase/src/corelib/codecs/qtextcodec.cpp
|
--- a/qtbase/src/corelib/codecs/qtextcodec.cpp
|
||||||
+++ b/qtbase/src/corelib/codecs/qtextcodec.cpp
|
+++ b/qtbase/src/corelib/codecs/qtextcodec.cpp
|
||||||
@@ -204,7 +204,11 @@ static QTextCodec *setupLocaleMapper()
|
@@ -208,7 +208,11 @@ static QTextCodec *setupLocaleMapper()
|
||||||
// First part is getting that locale name. First try setlocale() which
|
// First part is getting that locale name. First try setlocale() which
|
||||||
// definitely knows it, but since we cannot fully trust it, get ready
|
// definitely knows it, but since we cannot fully trust it, get ready
|
||||||
// to fall back to environment variables.
|
// to fall back to environment variables.
|
||||||
@ -51,7 +19,7 @@ index 0c9036a..0dac7c1 100644
|
|||||||
// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
|
// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
|
||||||
// environment variables.
|
// environment variables.
|
||||||
diff --git a/qtbase/src/corelib/global/qcompilerdetection.h b/qtbase/src/corelib/global/qcompilerdetection.h
|
diff --git a/qtbase/src/corelib/global/qcompilerdetection.h b/qtbase/src/corelib/global/qcompilerdetection.h
|
||||||
index 4142c17..2526e00 100644
|
index 345ab9e..ab6c275 100644
|
||||||
--- a/qtbase/src/corelib/global/qcompilerdetection.h
|
--- a/qtbase/src/corelib/global/qcompilerdetection.h
|
||||||
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
|
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
|
||||||
@@ -881,7 +881,9 @@
|
@@ -881,7 +881,9 @@
|
||||||
@ -65,8 +33,26 @@ index 4142c17..2526e00 100644
|
|||||||
# if Q_CC_GNU > 408 || __GNUC_PATCHLEVEL__ >= 1
|
# if Q_CC_GNU > 408 || __GNUC_PATCHLEVEL__ >= 1
|
||||||
# define Q_COMPILER_REF_QUALIFIERS
|
# define Q_COMPILER_REF_QUALIFIERS
|
||||||
# endif
|
# endif
|
||||||
|
diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp
|
||||||
|
index a123483..09b8a8e 100644
|
||||||
|
--- a/qtbase/src/corelib/global/qconfig.cpp
|
||||||
|
+++ b/qtbase/src/corelib/global/qconfig.cpp
|
||||||
|
@@ -1,10 +1,10 @@
|
||||||
|
/* Installation date */
|
||||||
|
static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
|
||||||
|
/* Installation Info */
|
||||||
|
-static const char qt_configure_prefix_path_str [12+256] = "qt_prfxpath=/usr/local/Qt-5.13.0";
|
||||||
|
+static const char qt_configure_prefix_path_str [12+256] = "qt_prfxpath=/qt";
|
||||||
|
#ifdef QT_BUILD_QMAKE
|
||||||
|
-static const char qt_configure_ext_prefix_path_str [12+256] = "qt_epfxpath=/usr/local/Qt-5.13.0";
|
||||||
|
-static const char qt_configure_host_prefix_path_str [12+256] = "qt_hpfxpath=/usr/local/Qt-5.13.0";
|
||||||
|
+static const char qt_configure_ext_prefix_path_str [12+256] = "qt_epfxpath=";
|
||||||
|
+static const char qt_configure_host_prefix_path_str [12+256] = "qt_hpfxpath=";
|
||||||
|
#endif
|
||||||
|
static const short qt_configure_str_offsets[] = {
|
||||||
|
0,
|
||||||
diff --git a/qtbase/src/corelib/global/qsystemdetection.h b/qtbase/src/corelib/global/qsystemdetection.h
|
diff --git a/qtbase/src/corelib/global/qsystemdetection.h b/qtbase/src/corelib/global/qsystemdetection.h
|
||||||
index 3b486b8..fdd57df 100644
|
index aabe46f..e262f2f 100644
|
||||||
--- a/qtbase/src/corelib/global/qsystemdetection.h
|
--- a/qtbase/src/corelib/global/qsystemdetection.h
|
||||||
+++ b/qtbase/src/corelib/global/qsystemdetection.h
|
+++ b/qtbase/src/corelib/global/qsystemdetection.h
|
||||||
@@ -47,6 +47,7 @@
|
@@ -47,6 +47,7 @@
|
||||||
@ -77,7 +63,7 @@ index 3b486b8..fdd57df 100644
|
|||||||
DARWIN - Any Darwin system (macOS, iOS, watchOS, tvOS)
|
DARWIN - Any Darwin system (macOS, iOS, watchOS, tvOS)
|
||||||
MACOS - macOS
|
MACOS - macOS
|
||||||
IOS - iOS
|
IOS - iOS
|
||||||
@@ -91,7 +92,9 @@
|
@@ -79,7 +80,9 @@
|
||||||
- Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU
|
- Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -89,7 +75,7 @@ index 3b486b8..fdd57df 100644
|
|||||||
# if defined(TARGET_OS_MAC) && TARGET_OS_MAC
|
# if defined(TARGET_OS_MAC) && TARGET_OS_MAC
|
||||||
# define Q_OS_DARWIN
|
# define Q_OS_DARWIN
|
||||||
diff --git a/qtbase/src/corelib/global/qversiontagging.cpp b/qtbase/src/corelib/global/qversiontagging.cpp
|
diff --git a/qtbase/src/corelib/global/qversiontagging.cpp b/qtbase/src/corelib/global/qversiontagging.cpp
|
||||||
index e3d4037..7e57df5 100644
|
index b5e524b..221c6a9 100644
|
||||||
--- a/qtbase/src/corelib/global/qversiontagging.cpp
|
--- a/qtbase/src/corelib/global/qversiontagging.cpp
|
||||||
+++ b/qtbase/src/corelib/global/qversiontagging.cpp
|
+++ b/qtbase/src/corelib/global/qversiontagging.cpp
|
||||||
@@ -42,7 +42,7 @@
|
@@ -42,7 +42,7 @@
|
||||||
@ -102,23 +88,23 @@ index e3d4037..7e57df5 100644
|
|||||||
Q_CORE_EXPORT extern const char sym ## _ ## m ## _ ## n = 0; \
|
Q_CORE_EXPORT extern const char sym ## _ ## m ## _ ## n = 0; \
|
||||||
asm(".symver " QT_STRINGIFY(sym) "_" QT_STRINGIFY(m) "_" QT_STRINGIFY(n) ", " \
|
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
|
diff --git a/qtbase/src/corelib/io/qresource.cpp b/qtbase/src/corelib/io/qresource.cpp
|
||||||
index febf226..0903322 100644
|
index e7d739b..225cda6 100644
|
||||||
--- a/qtbase/src/corelib/io/qresource.cpp
|
--- a/qtbase/src/corelib/io/qresource.cpp
|
||||||
+++ b/qtbase/src/corelib/io/qresource.cpp
|
+++ b/qtbase/src/corelib/io/qresource.cpp
|
||||||
@@ -943,7 +943,7 @@ public:
|
@@ -68,7 +68,7 @@
|
||||||
}
|
# include "private/qcore_unix_p.h"
|
||||||
};
|
#endif
|
||||||
|
|
||||||
-#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
|
-#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
|
||||||
+#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
|
+#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
|
||||||
# define QT_USE_MMAP
|
# define QT_USE_MMAP
|
||||||
|
# include <sys/mman.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp
|
diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp
|
||||||
index 3796df5..e0a8ddf 100644
|
index 5c0bf93..254a4ae 100644
|
||||||
--- a/qtbase/src/corelib/kernel/qcoreapplication.cpp
|
--- a/qtbase/src/corelib/kernel/qcoreapplication.cpp
|
||||||
+++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp
|
+++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp
|
||||||
@@ -575,7 +575,7 @@ void QCoreApplicationPrivate::initLocale()
|
@@ -612,7 +612,7 @@ void QCoreApplicationPrivate::initLocale()
|
||||||
if (qt_locale_initialized)
|
if (qt_locale_initialized)
|
||||||
return;
|
return;
|
||||||
qt_locale_initialized = true;
|
qt_locale_initialized = true;
|
||||||
@ -128,7 +114,7 @@ index 3796df5..e0a8ddf 100644
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
diff --git a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp
|
diff --git a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp
|
||||||
index 802962d..be1803c 100644
|
index df0cac0..d349ff1 100644
|
||||||
--- a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp
|
--- a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp
|
||||||
+++ b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp
|
+++ b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp
|
||||||
@@ -73,6 +73,11 @@
|
@@ -73,6 +73,11 @@
|
||||||
@ -153,11 +139,11 @@ index 802962d..be1803c 100644
|
|||||||
# ifndef QT_NO_EVENTFD
|
# ifndef QT_NO_EVENTFD
|
||||||
if (fds[1] == -1) {
|
if (fds[1] == -1) {
|
||||||
diff --git a/qtbase/src/corelib/kernel/qobject.h b/qtbase/src/corelib/kernel/qobject.h
|
diff --git a/qtbase/src/corelib/kernel/qobject.h b/qtbase/src/corelib/kernel/qobject.h
|
||||||
index 69b70ad..c2c8827 100644
|
index 63c5a9a..817d26b 100644
|
||||||
--- a/qtbase/src/corelib/kernel/qobject.h
|
--- a/qtbase/src/corelib/kernel/qobject.h
|
||||||
+++ b/qtbase/src/corelib/kernel/qobject.h
|
+++ b/qtbase/src/corelib/kernel/qobject.h
|
||||||
@@ -401,7 +401,7 @@ public:
|
@@ -414,7 +414,7 @@ public:
|
||||||
{ return const_cast<QObject *>(this)->qt_metacast(classname) != Q_NULLPTR; }
|
{ return const_cast<QObject *>(this)->qt_metacast(classname) != nullptr; }
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
- void deleteLater();
|
- void deleteLater();
|
||||||
@ -166,10 +152,10 @@ index 69b70ad..c2c8827 100644
|
|||||||
protected:
|
protected:
|
||||||
QObject *sender() const;
|
QObject *sender() const;
|
||||||
diff --git a/qtbase/src/corelib/kernel/qtranslator.cpp b/qtbase/src/corelib/kernel/qtranslator.cpp
|
diff --git a/qtbase/src/corelib/kernel/qtranslator.cpp b/qtbase/src/corelib/kernel/qtranslator.cpp
|
||||||
index 04a5e7e..9ec503b 100644
|
index dc0ab9f..a69e088 100644
|
||||||
--- a/qtbase/src/corelib/kernel/qtranslator.cpp
|
--- a/qtbase/src/corelib/kernel/qtranslator.cpp
|
||||||
+++ b/qtbase/src/corelib/kernel/qtranslator.cpp
|
+++ b/qtbase/src/corelib/kernel/qtranslator.cpp
|
||||||
@@ -57,7 +57,7 @@
|
@@ -58,7 +58,7 @@
|
||||||
#include "qendian.h"
|
#include "qendian.h"
|
||||||
#include "qresource.h"
|
#include "qresource.h"
|
||||||
|
|
||||||
@ -177,24 +163,24 @@ index 04a5e7e..9ec503b 100644
|
|||||||
+#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
|
+#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
|
||||||
#define QT_USE_MMAP
|
#define QT_USE_MMAP
|
||||||
#include "private/qcore_unix_p.h"
|
#include "private/qcore_unix_p.h"
|
||||||
#endif
|
// for mmap
|
||||||
diff --git a/qtbase/src/corelib/thread/qthread.cpp b/qtbase/src/corelib/thread/qthread.cpp
|
diff --git a/qtbase/src/corelib/thread/qthread.cpp b/qtbase/src/corelib/thread/qthread.cpp
|
||||||
index 7118ad5..316aa27 100644
|
index 9f60de1..38bdb38 100644
|
||||||
--- a/qtbase/src/corelib/thread/qthread.cpp
|
--- a/qtbase/src/corelib/thread/qthread.cpp
|
||||||
+++ b/qtbase/src/corelib/thread/qthread.cpp
|
+++ b/qtbase/src/corelib/thread/qthread.cpp
|
||||||
@@ -149,6 +149,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
|
@@ -166,6 +166,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
|
||||||
exited(false), returnCode(-1),
|
|
||||||
stackSize(0), priority(QThread::InheritPriority), data(d)
|
stackSize(0), priority(QThread::InheritPriority), data(d)
|
||||||
{
|
{
|
||||||
|
|
||||||
+#ifdef Q_OS_GENODE
|
+#ifdef Q_OS_GENODE
|
||||||
+ genode_thread = 0;
|
+ genode_thread = 0;
|
||||||
+#endif /* Q_OS_GENODE */
|
+#endif /* Q_OS_GENODE */
|
||||||
+
|
+
|
||||||
#if defined (Q_OS_WIN)
|
// INTEGRITY doesn't support self-extending stack. The default stack size for
|
||||||
handle = 0;
|
// a pthread on INTEGRITY is too small so we have to increase the default size
|
||||||
# ifndef Q_OS_WINRT
|
// to 128K.
|
||||||
diff --git a/qtbase/src/corelib/thread/qthread_p.h b/qtbase/src/corelib/thread/qthread_p.h
|
diff --git a/qtbase/src/corelib/thread/qthread_p.h b/qtbase/src/corelib/thread/qthread_p.h
|
||||||
index 37eca9c..ed05801 100644
|
index 57e6c99..fd038ec 100644
|
||||||
--- a/qtbase/src/corelib/thread/qthread_p.h
|
--- a/qtbase/src/corelib/thread/qthread_p.h
|
||||||
+++ b/qtbase/src/corelib/thread/qthread_p.h
|
+++ b/qtbase/src/corelib/thread/qthread_p.h
|
||||||
@@ -53,6 +53,10 @@
|
@@ -53,6 +53,10 @@
|
||||||
@ -208,7 +194,7 @@ index 37eca9c..ed05801 100644
|
|||||||
#include "qplatformdefs.h"
|
#include "qplatformdefs.h"
|
||||||
#include "QtCore/qthread.h"
|
#include "QtCore/qthread.h"
|
||||||
#include "QtCore/qmutex.h"
|
#include "QtCore/qmutex.h"
|
||||||
@@ -176,6 +180,58 @@ public:
|
@@ -179,6 +183,58 @@ public:
|
||||||
static QThread *threadForId(int id);
|
static QThread *threadForId(int id);
|
||||||
|
|
||||||
#ifdef Q_OS_UNIX
|
#ifdef Q_OS_UNIX
|
||||||
@ -268,10 +254,10 @@ index 37eca9c..ed05801 100644
|
|||||||
|
|
||||||
static void *start(void *arg);
|
static void *start(void *arg);
|
||||||
diff --git a/qtbase/src/corelib/tools/qdatetime.cpp b/qtbase/src/corelib/tools/qdatetime.cpp
|
diff --git a/qtbase/src/corelib/tools/qdatetime.cpp b/qtbase/src/corelib/tools/qdatetime.cpp
|
||||||
index a642358..419d051 100644
|
index 511dbf0..f1a7216 100644
|
||||||
--- a/qtbase/src/corelib/tools/qdatetime.cpp
|
--- a/qtbase/src/corelib/tools/qdatetime.cpp
|
||||||
+++ b/qtbase/src/corelib/tools/qdatetime.cpp
|
+++ b/qtbase/src/corelib/tools/qdatetime.cpp
|
||||||
@@ -2160,6 +2160,9 @@ static int qt_timezone()
|
@@ -2197,6 +2197,9 @@ static int qt_timezone()
|
||||||
long offset;
|
long offset;
|
||||||
_get_timezone(&offset);
|
_get_timezone(&offset);
|
||||||
return offset;
|
return offset;
|
||||||
@ -282,10 +268,10 @@ index a642358..419d051 100644
|
|||||||
time_t clock = time(NULL);
|
time_t clock = time(NULL);
|
||||||
struct tm t;
|
struct tm t;
|
||||||
diff --git a/qtbase/src/gui/image/qxpmhandler.cpp b/qtbase/src/gui/image/qxpmhandler.cpp
|
diff --git a/qtbase/src/gui/image/qxpmhandler.cpp b/qtbase/src/gui/image/qxpmhandler.cpp
|
||||||
index 1f1f6b3..7e67700 100644
|
index a32dfda..6f27cd2 100644
|
||||||
--- a/qtbase/src/gui/image/qxpmhandler.cpp
|
--- a/qtbase/src/gui/image/qxpmhandler.cpp
|
||||||
+++ b/qtbase/src/gui/image/qxpmhandler.cpp
|
+++ b/qtbase/src/gui/image/qxpmhandler.cpp
|
||||||
@@ -848,8 +848,16 @@ static bool read_xpm_header(
|
@@ -845,8 +845,16 @@ static bool read_xpm_header(
|
||||||
#ifdef Q_CC_MSVC
|
#ifdef Q_CC_MSVC
|
||||||
if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4)
|
if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4)
|
||||||
#else
|
#else
|
||||||
@ -301,12 +287,43 @@ index 1f1f6b3..7e67700 100644
|
|||||||
+#endif
|
+#endif
|
||||||
return false; // < 4 numbers parsed
|
return false; // < 4 numbers parsed
|
||||||
|
|
||||||
return true;
|
if (*w <= 0 || *w > 32767 || *h <= 0 || *h > 32767 || *ncols <= 0 || *ncols > (64 * 64 * 64 * 64) || *cpp <= 0 || *cpp > 15)
|
||||||
|
diff --git a/qtbase/src/gui/painting/qbrush.cpp b/qtbase/src/gui/painting/qbrush.cpp
|
||||||
|
index f56be55..5998aa0 100644
|
||||||
|
--- a/qtbase/src/gui/painting/qbrush.cpp
|
||||||
|
+++ b/qtbase/src/gui/painting/qbrush.cpp
|
||||||
|
@@ -1402,7 +1402,12 @@ QGradient::QGradient(Preset preset)
|
||||||
|
}
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
-static void initGradientPresets() { Q_INIT_RESOURCE(qmake_webgradients); }
|
||||||
|
+static void initGradientPresets()
|
||||||
|
+{
|
||||||
|
+#ifndef Q_OS_GENODE
|
||||||
|
+ Q_INIT_RESOURCE(qmake_webgradients);
|
||||||
|
+#endif
|
||||||
|
+}
|
||||||
|
Q_CONSTRUCTOR_FUNCTION(initGradientPresets);
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
diff --git a/qtbase/src/gui/qtgui-config.h b/qtbase/src/gui/qtgui-config.h
|
||||||
|
index 7444e61..1ae740d 100644
|
||||||
|
--- a/qtbase/src/gui/qtgui-config.h
|
||||||
|
+++ b/qtbase/src/gui/qtgui-config.h
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
#define QT_FEATURE_openvg -1
|
||||||
|
#define QT_FEATURE_pdf 1
|
||||||
|
#define QT_FEATURE_picture 1
|
||||||
|
-#define QT_QPA_DEFAULT_PLATFORM_NAME "minimal"
|
||||||
|
+#define QT_QPA_DEFAULT_PLATFORM_NAME "nitpicker"
|
||||||
|
#define QT_FEATURE_sessionmanager -1
|
||||||
|
#define QT_NO_SESSIONMANAGER
|
||||||
|
#define QT_FEATURE_shortcut 1
|
||||||
diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp
|
diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp
|
||||||
index 24ada3a..35364b2 100644
|
index c9c3172..ff53f70 100644
|
||||||
--- a/qtbase/src/network/access/qhttpnetworkreply.cpp
|
--- a/qtbase/src/network/access/qhttpnetworkreply.cpp
|
||||||
+++ b/qtbase/src/network/access/qhttpnetworkreply.cpp
|
+++ b/qtbase/src/network/access/qhttpnetworkreply.cpp
|
||||||
@@ -251,8 +251,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size)
|
@@ -249,8 +249,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size)
|
||||||
|
|
||||||
bool QHttpNetworkReply::supportsUserProvidedDownloadBuffer()
|
bool QHttpNetworkReply::supportsUserProvidedDownloadBuffer()
|
||||||
{
|
{
|
||||||
@ -324,10 +341,10 @@ index 24ada3a..35364b2 100644
|
|||||||
|
|
||||||
void QHttpNetworkReply::setUserProvidedDownloadBuffer(char* b)
|
void QHttpNetworkReply::setUserProvidedDownloadBuffer(char* b)
|
||||||
diff --git a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp
|
diff --git a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp
|
||||||
index 6043943..291df77 100644
|
index 60353cb..5ecd1b7 100644
|
||||||
--- a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp
|
--- a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp
|
||||||
+++ b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp
|
+++ b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp
|
||||||
@@ -124,6 +124,7 @@ void QNetworkAccessFileBackend::open()
|
@@ -127,6 +127,7 @@ void QNetworkAccessFileBackend::open()
|
||||||
url.setPath(QLatin1String("/"));
|
url.setPath(QLatin1String("/"));
|
||||||
setUrl(url);
|
setUrl(url);
|
||||||
|
|
||||||
@ -335,7 +352,7 @@ index 6043943..291df77 100644
|
|||||||
QString fileName = url.toLocalFile();
|
QString fileName = url.toLocalFile();
|
||||||
if (fileName.isEmpty()) {
|
if (fileName.isEmpty()) {
|
||||||
if (url.scheme() == QLatin1String("qrc")) {
|
if (url.scheme() == QLatin1String("qrc")) {
|
||||||
@@ -137,6 +138,10 @@ void QNetworkAccessFileBackend::open()
|
@@ -140,6 +141,10 @@ void QNetworkAccessFileBackend::open()
|
||||||
fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
|
fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -347,52 +364,39 @@ index 6043943..291df77 100644
|
|||||||
|
|
||||||
if (operation() == QNetworkAccessManager::GetOperation) {
|
if (operation() == QNetworkAccessManager::GetOperation) {
|
||||||
diff --git a/qtbase/src/network/kernel/qhostinfo.cpp b/qtbase/src/network/kernel/qhostinfo.cpp
|
diff --git a/qtbase/src/network/kernel/qhostinfo.cpp b/qtbase/src/network/kernel/qhostinfo.cpp
|
||||||
index 88df65d..cbaca0b 100644
|
index 4b5acc1..1cb4e75 100644
|
||||||
--- a/qtbase/src/network/kernel/qhostinfo.cpp
|
--- a/qtbase/src/network/kernel/qhostinfo.cpp
|
||||||
+++ b/qtbase/src/network/kernel/qhostinfo.cpp
|
+++ b/qtbase/src/network/kernel/qhostinfo.cpp
|
||||||
@@ -556,7 +556,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was
|
@@ -728,7 +728,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was
|
||||||
{
|
|
||||||
moveToThread(QCoreApplicationPrivate::mainThread());
|
moveToThread(QCoreApplicationPrivate::mainThread());
|
||||||
|
#if QT_CONFIG(thread)
|
||||||
connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection);
|
connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection);
|
||||||
+#ifdef Q_OS_GENODE
|
+#ifdef Q_OS_GENODE
|
||||||
+ /* 'getaddrinfo()' is currently not thread-safe on Genode */
|
+ /* 'getaddrinfo()' is currently not thread-safe on Genode */
|
||||||
+ threadPool.setMaxThreadCount(1);
|
+ threadPool.setMaxThreadCount(1);
|
||||||
+#else
|
+#else
|
||||||
threadPool.setMaxThreadCount(20); // do up to 20 DNS lookups in parallel
|
threadPool.setMaxThreadCount(20); // do up to 20 DNS lookups in parallel
|
||||||
+#endif
|
+#endif /* Q_OS_GENODE */
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
QHostInfoLookupManager::~QHostInfoLookupManager()
|
|
||||||
diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||||
index 7af8db7..1f40ad1 100644
|
index e4810d6..fd1be48 100644
|
||||||
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||||
+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||||
@@ -148,6 +148,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
|
@@ -221,7 +221,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
|
||||||
QHostAddress address;
|
char hbuf[NI_MAXHOST];
|
||||||
if (address.setAddress(hostName)) {
|
if (sa && getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0)
|
||||||
// Reverse lookup
|
results.setHostName(QString::fromLatin1(hbuf));
|
||||||
+#ifdef Q_OS_GENODE
|
|
||||||
+ results.setError(QHostInfo::HostNotFound);
|
|
||||||
+ results.setErrorString(tr("Reverse lookup is not implemented because of missing support in lwip."));
|
|
||||||
+ return results;
|
|
||||||
+#else
|
|
||||||
// Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead.
|
|
||||||
#if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN)
|
|
||||||
sockaddr_in sa4;
|
|
||||||
@@ -178,7 +183,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
|
|
||||||
if (ent)
|
|
||||||
results.setHostName(QString::fromLatin1(ent->h_name));
|
|
||||||
#endif
|
|
||||||
-
|
-
|
||||||
+#endif
|
|
||||||
if (results.hostName().isEmpty())
|
if (results.hostName().isEmpty())
|
||||||
results.setHostName(address.toString());
|
results.setHostName(address.toString());
|
||||||
results.setAddresses(QList<QHostAddress>() << address);
|
results.setAddresses(QList<QHostAddress>() << address);
|
||||||
diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
||||||
index d981675..ae80a59 100644
|
index 24c1712..2dffde6 100644
|
||||||
--- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
--- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
||||||
+++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
+++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp
|
||||||
@@ -442,6 +442,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
|
@@ -472,6 +472,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
|
||||||
case EISCONN:
|
case EISCONN:
|
||||||
socketState = QAbstractSocket::ConnectedState;
|
socketState = QAbstractSocket::ConnectedState;
|
||||||
break;
|
break;
|
||||||
@ -416,10 +420,10 @@ index d981675..ae80a59 100644
|
|||||||
case EINVAL:
|
case EINVAL:
|
||||||
setError(QAbstractSocket::ConnectionRefusedError, ConnectionRefusedErrorString);
|
setError(QAbstractSocket::ConnectionRefusedError, ConnectionRefusedErrorString);
|
||||||
diff --git a/qtbase/src/network/socket/qnet_unix_p.h b/qtbase/src/network/socket/qnet_unix_p.h
|
diff --git a/qtbase/src/network/socket/qnet_unix_p.h b/qtbase/src/network/socket/qnet_unix_p.h
|
||||||
index 46fbc97..c9d8261 100644
|
index e038352..94ed684 100644
|
||||||
--- a/qtbase/src/network/socket/qnet_unix_p.h
|
--- a/qtbase/src/network/socket/qnet_unix_p.h
|
||||||
+++ b/qtbase/src/network/socket/qnet_unix_p.h
|
+++ b/qtbase/src/network/socket/qnet_unix_p.h
|
||||||
@@ -186,6 +186,10 @@ static inline in_addr_t qt_safe_inet_addr(const char *cp)
|
@@ -173,6 +173,10 @@ static inline int qt_safe_ioctl(int sockfd, unsigned long request, T arg)
|
||||||
|
|
||||||
static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags)
|
static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags)
|
||||||
{
|
{
|
||||||
@ -430,7 +434,7 @@ index 46fbc97..c9d8261 100644
|
|||||||
#ifdef MSG_NOSIGNAL
|
#ifdef MSG_NOSIGNAL
|
||||||
flags |= MSG_NOSIGNAL;
|
flags |= MSG_NOSIGNAL;
|
||||||
#else
|
#else
|
||||||
@@ -195,14 +199,20 @@ static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flag
|
@@ -182,14 +186,20 @@ static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flag
|
||||||
int ret;
|
int ret;
|
||||||
EINTR_LOOP(ret, ::sendmsg(sockfd, msg, flags));
|
EINTR_LOOP(ret, ::sendmsg(sockfd, msg, flags));
|
||||||
return ret;
|
return ret;
|
||||||
@ -452,10 +456,10 @@ index 46fbc97..c9d8261 100644
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
diff --git a/qtbase/src/network/ssl/qsslconfiguration_p.h b/qtbase/src/network/ssl/qsslconfiguration_p.h
|
diff --git a/qtbase/src/network/ssl/qsslconfiguration_p.h b/qtbase/src/network/ssl/qsslconfiguration_p.h
|
||||||
index 6adf2c9..e080563 100644
|
index 83126bb..7cd978b 100644
|
||||||
--- a/qtbase/src/network/ssl/qsslconfiguration_p.h
|
--- a/qtbase/src/network/ssl/qsslconfiguration_p.h
|
||||||
+++ b/qtbase/src/network/ssl/qsslconfiguration_p.h
|
+++ b/qtbase/src/network/ssl/qsslconfiguration_p.h
|
||||||
@@ -84,7 +84,16 @@ public:
|
@@ -85,7 +85,16 @@ public:
|
||||||
QSslConfigurationPrivate()
|
QSslConfigurationPrivate()
|
||||||
: sessionProtocol(QSsl::UnknownProtocol),
|
: sessionProtocol(QSsl::UnknownProtocol),
|
||||||
protocol(QSsl::SecureProtocols),
|
protocol(QSsl::SecureProtocols),
|
||||||
@ -472,57 +476,36 @@ index 6adf2c9..e080563 100644
|
|||||||
peerVerifyDepth(0),
|
peerVerifyDepth(0),
|
||||||
allowRootCertOnDemandLoading(true),
|
allowRootCertOnDemandLoading(true),
|
||||||
peerSessionShared(false),
|
peerSessionShared(false),
|
||||||
diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
|
diff --git a/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp b/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp
|
||||||
index aca7507..8318a10 100644
|
index f5aab82..f84baaa 100644
|
||||||
--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp
|
--- a/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp
|
||||||
+++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
|
+++ b/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp
|
||||||
@@ -504,7 +504,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
|
@@ -221,7 +221,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
|
||||||
if (q_SSL_library_init() != 1)
|
if (q_SSL_library_init() != 1)
|
||||||
return false;
|
return false;
|
||||||
q_SSL_load_error_strings();
|
q_SSL_load_error_strings();
|
||||||
+#ifndef Q_OS_GENODE
|
+#ifndef Q_OS_GENODE
|
||||||
+ /* FIXME: currently, on Genode this function causes 'exit(1)' */
|
+ /* FIXME: currently, on Genode this function causes 'exit(1)' */
|
||||||
q_OpenSSL_add_all_algorithms();
|
q_OpenSSL_add_all_algorithms_safe();
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
|
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
|
||||||
if (q_SSLeay() >= 0x10001000L)
|
if (q_SSLeay() >= 0x10001000L)
|
||||||
diff --git a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
|
||||||
index 60ddc9f..0cc2f0b 100644
|
|
||||||
--- a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
|
||||||
+++ b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
|
||||||
@@ -80,7 +80,16 @@ void QBasicFontDatabase::populateFontDatabase()
|
|
||||||
const auto fis = dir.entryInfoList(nameFilters, QDir::Files);
|
|
||||||
for (const QFileInfo &fi : fis) {
|
|
||||||
const QByteArray file = QFile::encodeName(fi.absoluteFilePath());
|
|
||||||
+#ifdef Q_OS_GENODE
|
|
||||||
+ QByteArray data;
|
|
||||||
+ QFile f(file);
|
|
||||||
+ if (!f.open(QIODevice::ReadOnly))
|
|
||||||
+ continue;
|
|
||||||
+ data = f.readAll();
|
|
||||||
+ QBasicFontDatabase::addTTFile(data, file);
|
|
||||||
+#else
|
|
||||||
QBasicFontDatabase::addTTFile(QByteArray(), file);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
||||||
index bc04852..8394318 100644
|
index 17bf0fb..2908374 100644
|
||||||
--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
||||||
+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
||||||
@@ -52,7 +52,9 @@
|
@@ -55,7 +55,9 @@
|
||||||
//
|
#ifdef Q_OS_FREEBSD
|
||||||
|
#include <dev/evdev/input.h>
|
||||||
#include "qnamespace.h"
|
#else
|
||||||
+#ifndef Q_OS_GENODE
|
+#ifndef Q_OS_GENODE
|
||||||
#include "linux/input.h"
|
#include "linux/input.h"
|
||||||
+#endif /* Q_OS_GENODE */
|
+#endif /* Q_OS_GENODE */
|
||||||
|
#endif
|
||||||
|
|
||||||
// no QT_BEGIN_NAMESPACE, since we include it internally...
|
// no QT_BEGIN_NAMESPACE, since we include it internally...
|
||||||
|
@@ -648,6 +650,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, 0x06, 0x08, 0x0200 },
|
||||||
{ 111, 0xffff, 0x01000000, 0x0c, 0x08, 0x0200 },
|
{ 111, 0xffff, 0x01000000, 0x0c, 0x08, 0x0200 },
|
||||||
|
|
||||||
@ -530,7 +513,7 @@ index bc04852..8394318 100644
|
|||||||
// 113 -> 248
|
// 113 -> 248
|
||||||
{ KEY_MUTE, 0xffff, Qt::Key_VolumeMute, 0x00, 0x00, 0x0000 },
|
{ KEY_MUTE, 0xffff, Qt::Key_VolumeMute, 0x00, 0x00, 0x0000 },
|
||||||
{ KEY_VOLUMEDOWN, 0xffff, Qt::Key_VolumeDown, 0x00, 0x00, 0x0000 },
|
{ KEY_VOLUMEDOWN, 0xffff, Qt::Key_VolumeDown, 0x00, 0x00, 0x0000 },
|
||||||
@@ -672,6 +675,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
|
@@ -676,6 +679,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
|
||||||
{ KEY_BLUE, 0xffff, Qt::Key_Blue, 0x00, 0x00, 0x0000 },
|
{ KEY_BLUE, 0xffff, Qt::Key_Blue, 0x00, 0x00, 0x0000 },
|
||||||
{ KEY_CHANNELUP, 0xffff, Qt::Key_ChannelUp, 0x00, 0x00, 0x0000 },
|
{ KEY_CHANNELUP, 0xffff, Qt::Key_ChannelUp, 0x00, 0x00, 0x0000 },
|
||||||
{ KEY_CHANNELDOWN, 0xffff, Qt::Key_ChannelDown, 0x00, 0x00, 0x0000 },
|
{ KEY_CHANNELDOWN, 0xffff, Qt::Key_ChannelDown, 0x00, 0x00, 0x0000 },
|
||||||
@ -539,32 +522,32 @@ index bc04852..8394318 100644
|
|||||||
|
|
||||||
const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = {
|
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
|
diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
|
||||||
index 0eb6fc0..cf19fec 100644
|
index 666613f..e99bf58 100644
|
||||||
--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
|
--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
|
||||||
+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
|
+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
|
||||||
@@ -49,7 +49,9 @@
|
@@ -55,7 +55,9 @@
|
||||||
#include <qpa/qwindowsysteminterface.h>
|
#ifdef Q_OS_FREEBSD
|
||||||
#include <private/qcore_unix_p.h>
|
#include <dev/evdev/input.h>
|
||||||
|
#else
|
||||||
+#ifndef Q_OS_GENODE
|
+#ifndef Q_OS_GENODE
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
+#endif /* Q_OS_GENODE */
|
+#endif /* Q_OS_GENODE */
|
||||||
|
#endif
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
@@ -88,9 +90,11 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, QFdContainer
|
||||||
@@ -81,9 +83,11 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, QFdContainer
|
|
||||||
if (keymapFile.isEmpty() || !loadKeymap(keymapFile))
|
if (keymapFile.isEmpty() || !loadKeymap(keymapFile))
|
||||||
unloadKeymap();
|
unloadKeymap();
|
||||||
|
|
||||||
+#ifndef Q_OS_GENODE
|
+#ifndef Q_OS_GENODE
|
||||||
// socket notifier for events on the keyboard device
|
// socket notifier for events on the keyboard device
|
||||||
m_notify = new QSocketNotifier(m_fd.get(), QSocketNotifier::Read, this);
|
m_notify = new QSocketNotifier(m_fd.get(), QSocketNotifier::Read, this);
|
||||||
connect(m_notify, SIGNAL(activated(int)), this, SLOT(readKeycode()));
|
connect(m_notify, &QSocketNotifier::activated, this, &QEvdevKeyboardHandler::readKeycode);
|
||||||
+#endif /* Q_OS_GENODE */
|
+#endif /* Q_OS_GENODE */
|
||||||
}
|
}
|
||||||
|
|
||||||
QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
|
QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
|
||||||
@@ -91,6 +95,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
|
@@ -98,6 +102,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
|
||||||
unloadKeymap();
|
unloadKeymap();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -572,7 +555,7 @@ index 0eb6fc0..cf19fec 100644
|
|||||||
QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
|
QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
|
||||||
const QString &specification,
|
const QString &specification,
|
||||||
const QString &defaultKeymapFile)
|
const QString &defaultKeymapFile)
|
||||||
@@ -214,10 +219,20 @@ void QEvdevKeyboardHandler::readKeycode()
|
@@ -221,10 +226,21 @@ void QEvdevKeyboardHandler::readKeycode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -590,10 +573,11 @@ index 0eb6fc0..cf19fec 100644
|
|||||||
+ ((qtcode >= Qt::Key_A) && (qtcode <= Qt::Key_Z)))
|
+ ((qtcode >= Qt::Key_A) && (qtcode <= Qt::Key_Z)))
|
||||||
+ return;
|
+ return;
|
||||||
+#endif
|
+#endif
|
||||||
QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease),
|
+
|
||||||
qtcode, modifiers, nativecode + 8, 0, int(modifiers),
|
if (!autoRepeat)
|
||||||
(unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat);
|
QGuiApplicationPrivate::inputDeviceManager()->setKeyboardModifiers(QEvdevKeyboardHandler::toQtModifiers(m_modifiers));
|
||||||
@@ -477,6 +492,7 @@ void QEvdevKeyboardHandler::unloadKeymap()
|
|
||||||
|
@@ -491,6 +507,7 @@ void QEvdevKeyboardHandler::unloadKeymap()
|
||||||
m_composing = 0;
|
m_composing = 0;
|
||||||
m_dead_unicode = 0xffff;
|
m_dead_unicode = 0xffff;
|
||||||
|
|
||||||
@ -601,34 +585,34 @@ index 0eb6fc0..cf19fec 100644
|
|||||||
//Set locks according to keyboard leds
|
//Set locks according to keyboard leds
|
||||||
quint16 ledbits[1];
|
quint16 ledbits[1];
|
||||||
memset(ledbits, 0, sizeof(ledbits));
|
memset(ledbits, 0, sizeof(ledbits));
|
||||||
@@ -497,6 +513,7 @@ void QEvdevKeyboardHandler::unloadKeymap()
|
@@ -513,6 +530,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]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_langLock = 0;
|
||||||
+#endif /* Q_OS_GENODE */
|
+#endif /* Q_OS_GENODE */
|
||||||
}
|
}
|
||||||
|
|
||||||
bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
|
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
|
diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
|
||||||
index 1ec4915..fed7024 100644
|
index 21e6d05..b3f18b0 100644
|
||||||
--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
|
--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
|
||||||
+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
|
+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
|
||||||
@@ -190,8 +190,10 @@ public:
|
@@ -189,7 +189,10 @@ public:
|
||||||
bool loadKeymap(const QString &file);
|
bool loadKeymap(const QString &file);
|
||||||
void unloadKeymap();
|
void unloadKeymap();
|
||||||
|
|
||||||
+#ifndef Q_OS_GENODE
|
+#ifndef Q_OS_GENODE
|
||||||
private slots:
|
+private slots:
|
||||||
void readKeycode();
|
void readKeycode();
|
||||||
+#endif /* Q_OS_GENODE */
|
+#endif /* Q_OS_GENODE */
|
||||||
KeycodeAction processKeycode(quint16 keycode, bool pressed, bool autorepeat);
|
KeycodeAction processKeycode(quint16 keycode, bool pressed, bool autorepeat);
|
||||||
|
|
||||||
private:
|
void switchLang();
|
||||||
diff --git a/qtbase/src/testlib/qtestcase.cpp b/qtbase/src/testlib/qtestcase.cpp
|
diff --git a/qtbase/src/testlib/qtestcase.cpp b/qtbase/src/testlib/qtestcase.cpp
|
||||||
index 1c13f8e..f89b55c 100644
|
index 1f69429..938990f 100644
|
||||||
--- a/qtbase/src/testlib/qtestcase.cpp
|
--- a/qtbase/src/testlib/qtestcase.cpp
|
||||||
+++ b/qtbase/src/testlib/qtestcase.cpp
|
+++ b/qtbase/src/testlib/qtestcase.cpp
|
||||||
@@ -1391,7 +1391,7 @@ FatalSignalHandler::FatalSignalHandler()
|
@@ -1554,7 +1554,7 @@ FatalSignalHandler::FatalSignalHandler()
|
||||||
|
|
||||||
// tvOS/watchOS both define SA_ONSTACK (in sys/signal.h) but mark sigaltstack() as
|
// tvOS/watchOS both define SA_ONSTACK (in sys/signal.h) but mark sigaltstack() as
|
||||||
// unavailable (__WATCHOS_PROHIBITED __TVOS_PROHIBITED in signal.h)
|
// unavailable (__WATCHOS_PROHIBITED __TVOS_PROHIBITED in signal.h)
|
||||||
@ -638,33 +622,33 @@ index 1c13f8e..f89b55c 100644
|
|||||||
// This is necessary if SIGSEGV is to catch a stack overflow
|
// This is necessary if SIGSEGV is to catch a stack overflow
|
||||||
# if defined(Q_CC_GNU) && defined(Q_OF_ELF)
|
# if defined(Q_CC_GNU) && defined(Q_OF_ELF)
|
||||||
diff --git a/qtbase/src/widgets/dialogs/qfiledialog.cpp b/qtbase/src/widgets/dialogs/qfiledialog.cpp
|
diff --git a/qtbase/src/widgets/dialogs/qfiledialog.cpp b/qtbase/src/widgets/dialogs/qfiledialog.cpp
|
||||||
index 74875fa..2f6410e 100644
|
index f772eb1..9844056 100644
|
||||||
--- a/qtbase/src/widgets/dialogs/qfiledialog.cpp
|
--- a/qtbase/src/widgets/dialogs/qfiledialog.cpp
|
||||||
+++ b/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)
|
@@ -1146,7 +1146,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path)
|
||||||
const QString homePath = QDir::homePath();
|
const QString homePath = QDir::homePath();
|
||||||
#else
|
#else
|
||||||
const QByteArray userName = path.midRef(1, separatorPosition - 1).toLocal8Bit();
|
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_WASM)
|
||||||
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_GENODE)
|
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) && !defined(Q_OS_GENODE)
|
||||||
passwd pw;
|
passwd pw;
|
||||||
passwd *tmpPw;
|
passwd *tmpPw;
|
||||||
char buf[200];
|
char buf[200];
|
||||||
diff --git a/qtbase/src/widgets/styles/qstylefactory.cpp b/qtbase/src/widgets/styles/qstylefactory.cpp
|
diff --git a/qtbase/src/widgets/styles/qstylefactory.cpp b/qtbase/src/widgets/styles/qstylefactory.cpp
|
||||||
index 09cccff..d24fecb 100644
|
index b0ce5e5..fe0366b 100644
|
||||||
--- a/qtbase/src/widgets/styles/qstylefactory.cpp
|
--- a/qtbase/src/widgets/styles/qstylefactory.cpp
|
||||||
+++ b/qtbase/src/widgets/styles/qstylefactory.cpp
|
+++ b/qtbase/src/widgets/styles/qstylefactory.cpp
|
||||||
@@ -160,6 +160,13 @@ QStringList QStyleFactory::keys()
|
@@ -123,6 +123,13 @@ QStringList QStyleFactory::keys()
|
||||||
const PluginKeyMap::const_iterator cend = keyMap.constEnd();
|
const PluginKeyMap::const_iterator cend = keyMap.constEnd();
|
||||||
for (PluginKeyMap::const_iterator it = keyMap.constBegin(); it != cend; ++it)
|
for (PluginKeyMap::const_iterator it = keyMap.constBegin(); it != cend; ++it)
|
||||||
list.append(it.value());
|
list.append(it.value());
|
||||||
+#ifdef Q_OS_GENODE
|
+#ifdef Q_OS_GENODE
|
||||||
+/* on Genode, the first style in the list gets selected by default and we want the "Fusion" style */
|
+/* on Genode, the first style in the list gets selected by default and we want the "Fusion" style */
|
||||||
+#ifndef QT_NO_STYLE_FUSION
|
+#if QT_CONFIG(style_fusion)
|
||||||
+ if (!list.contains(QLatin1String("Fusion")))
|
+ if (!list.contains(QLatin1String("Fusion")))
|
||||||
+ list << QLatin1String("Fusion");
|
+ list << QLatin1String("Fusion");
|
||||||
+#endif
|
+#endif
|
||||||
+#endif
|
+#endif
|
||||||
#ifndef QT_NO_STYLE_WINDOWS
|
#if QT_CONFIG(style_windows)
|
||||||
if (!list.contains(QLatin1String("Windows")))
|
if (!list.contains(QLatin1String("Windows")))
|
||||||
list << QLatin1String("Windows");
|
list << QLatin1String("Windows");
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
qtbase_genode_openglwindow_example.patch
|
qtbase_genode_openglwindow_example.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtbase/examples/gui/openglwindow/openglwindow.pro | 10 +++++++---
|
|
||||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtbase/examples/gui/openglwindow/openglwindow.pro b/qtbase/examples/gui/openglwindow/openglwindow.pro
|
diff --git a/qtbase/examples/gui/openglwindow/openglwindow.pro b/qtbase/examples/gui/openglwindow/openglwindow.pro
|
||||||
index 93f18f3..ffff275 100644
|
index 93f18f3..ffff275 100644
|
||||||
--- a/qtbase/examples/gui/openglwindow/openglwindow.pro
|
--- a/qtbase/examples/gui/openglwindow/openglwindow.pro
|
||||||
|
@ -1,18 +1,10 @@
|
|||||||
qtbase_genode_qtscriptclassic.patch
|
qtbase_genode_qtscriptclassic.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtbase/src/corelib/global/qglobal.h | 6 +++++-
|
|
||||||
qtbase/src/corelib/kernel/qvariant_p.h | 3 +++
|
|
||||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h
|
diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h
|
||||||
index 3217691..570158a 100644
|
index 223ebbc..965e6d0 100644
|
||||||
--- a/qtbase/src/corelib/global/qglobal.h
|
--- a/qtbase/src/corelib/global/qglobal.h
|
||||||
+++ b/qtbase/src/corelib/global/qglobal.h
|
+++ b/qtbase/src/corelib/global/qglobal.h
|
||||||
@@ -866,13 +866,17 @@ inline void qSwap(T &value1, T &value2)
|
@@ -923,13 +923,17 @@ inline void qSwap(T &value1, T &value2)
|
||||||
swap(value1, value2);
|
swap(value1, value2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,10 +24,10 @@ index 3217691..570158a 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 *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment) Q_ALLOC_SIZE(2);
|
||||||
Q_CORE_EXPORT void qFreeAligned(void *ptr);
|
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
|
diff --git a/qtbase/src/corelib/kernel/qvariant_p.h b/qtbase/src/corelib/kernel/qvariant_p.h
|
||||||
index bf88def..d6c2b0c 100644
|
index b22b7c2..f79d473 100644
|
||||||
--- a/qtbase/src/corelib/kernel/qvariant_p.h
|
--- a/qtbase/src/corelib/kernel/qvariant_p.h
|
||||||
+++ b/qtbase/src/corelib/kernel/qvariant_p.h
|
+++ b/qtbase/src/corelib/kernel/qvariant_p.h
|
||||||
@@ -350,7 +350,10 @@ public:
|
@@ -380,7 +380,10 @@ public:
|
||||||
|
|
||||||
void delegate(const void*)
|
void delegate(const void*)
|
||||||
{
|
{
|
||||||
|
@ -1,18 +1,10 @@
|
|||||||
qtbase_genode_textedit_example.patch
|
qtbase_genode_textedit_example.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
.../widgets/richtext/textedit/textedit.cpp | 15 +++++++++++----
|
|
||||||
.../widgets/richtext/textedit/textedit.pro | 4 ----
|
|
||||||
2 files changed, 11 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.cpp b/qtbase/examples/widgets/richtext/textedit/textedit.cpp
|
diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.cpp b/qtbase/examples/widgets/richtext/textedit/textedit.cpp
|
||||||
index dec0b0b..a91002c 100644
|
index 00ea032..83de198 100644
|
||||||
--- a/qtbase/examples/widgets/richtext/textedit/textedit.cpp
|
--- a/qtbase/examples/widgets/richtext/textedit/textedit.cpp
|
||||||
+++ b/qtbase/examples/widgets/richtext/textedit/textedit.cpp
|
+++ b/qtbase/examples/widgets/richtext/textedit/textedit.cpp
|
||||||
@@ -430,7 +430,8 @@ void TextEdit::fileOpen()
|
@@ -451,7 +451,8 @@ void TextEdit::fileOpen()
|
||||||
QFileDialog fileDialog(this, tr("Open File..."));
|
QFileDialog fileDialog(this, tr("Open File..."));
|
||||||
fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
|
fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
|
||||||
fileDialog.setFileMode(QFileDialog::ExistingFile);
|
fileDialog.setFileMode(QFileDialog::ExistingFile);
|
||||||
@ -22,7 +14,7 @@ index dec0b0b..a91002c 100644
|
|||||||
if (fileDialog.exec() != QDialog::Accepted)
|
if (fileDialog.exec() != QDialog::Accepted)
|
||||||
return;
|
return;
|
||||||
const QString fn = fileDialog.selectedFiles().first();
|
const QString fn = fileDialog.selectedFiles().first();
|
||||||
@@ -447,7 +448,12 @@ bool TextEdit::fileSave()
|
@@ -468,7 +469,12 @@ bool TextEdit::fileSave()
|
||||||
if (fileName.startsWith(QStringLiteral(":/")))
|
if (fileName.startsWith(QStringLiteral(":/")))
|
||||||
return fileSaveAs();
|
return fileSaveAs();
|
||||||
|
|
||||||
@ -36,7 +28,7 @@ index dec0b0b..a91002c 100644
|
|||||||
bool success = writer.write(textEdit->document());
|
bool success = writer.write(textEdit->document());
|
||||||
if (success) {
|
if (success) {
|
||||||
textEdit->document()->setModified(false);
|
textEdit->document()->setModified(false);
|
||||||
@@ -464,9 +470,10 @@ bool TextEdit::fileSaveAs()
|
@@ -485,9 +491,10 @@ bool TextEdit::fileSaveAs()
|
||||||
QFileDialog fileDialog(this, tr("Save as..."));
|
QFileDialog fileDialog(this, tr("Save as..."));
|
||||||
fileDialog.setAcceptMode(QFileDialog::AcceptSave);
|
fileDialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
QStringList mimeTypes;
|
QStringList mimeTypes;
|
||||||
@ -50,10 +42,16 @@ index dec0b0b..a91002c 100644
|
|||||||
return false;
|
return false;
|
||||||
const QString fn = fileDialog.selectedFiles().first();
|
const QString fn = fileDialog.selectedFiles().first();
|
||||||
diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.pro b/qtbase/examples/widgets/richtext/textedit/textedit.pro
|
diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.pro b/qtbase/examples/widgets/richtext/textedit/textedit.pro
|
||||||
index c32bf68..704f738 100644
|
index b7a2155..704f738 100644
|
||||||
--- a/qtbase/examples/widgets/richtext/textedit/textedit.pro
|
--- a/qtbase/examples/widgets/richtext/textedit/textedit.pro
|
||||||
+++ b/qtbase/examples/widgets/richtext/textedit/textedit.pro
|
+++ b/qtbase/examples/widgets/richtext/textedit/textedit.pro
|
||||||
@@ -9,10 +9,6 @@ SOURCES = textedit.cpp \
|
@@ -1,5 +1,4 @@
|
||||||
|
QT += widgets
|
||||||
|
-requires(qtConfig(filedialog))
|
||||||
|
qtHaveModule(printsupport): QT += printsupport
|
||||||
|
|
||||||
|
TEMPLATE = app
|
||||||
|
@@ -10,10 +9,6 @@ SOURCES = textedit.cpp \
|
||||||
main.cpp
|
main.cpp
|
||||||
|
|
||||||
RESOURCES += textedit.qrc
|
RESOURCES += textedit.qrc
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
|
qtbase_qwindow_title.patch
|
||||||
|
|
||||||
diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
||||||
index b91fbcf..3221bf3 100644
|
index 143cc60..5e4842c 100644
|
||||||
--- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
--- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
||||||
+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp
|
||||||
@@ -122,6 +122,7 @@ QWidgetWindow::QWidgetWindow(QWidget *widget)
|
@@ -150,6 +150,7 @@ QWidgetWindow::QWidgetWindow(QWidget *widget)
|
||||||
: QWindow(*new QWidgetWindowPrivate(), 0)
|
: QWindow(*new QWidgetWindowPrivate(), 0)
|
||||||
, m_widget(widget)
|
, m_widget(widget)
|
||||||
{
|
{
|
||||||
|
@ -1,24 +1,16 @@
|
|||||||
qtdeclarative_configuration.patch
|
qtdeclarative_configuration.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtdeclarative/tools/tools.pro | 4 +---
|
|
||||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro
|
diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro
|
||||||
index 3952ec4..86257a7 100644
|
index 73cb6e2..462b197 100644
|
||||||
--- a/qtdeclarative/tools/tools.pro
|
--- a/qtdeclarative/tools/tools.pro
|
||||||
+++ b/qtdeclarative/tools/tools.pro
|
+++ b/qtdeclarative/tools/tools.pro
|
||||||
@@ -17,9 +17,7 @@ qmlimportscanner.CONFIG = host_build
|
@@ -20,8 +20,7 @@ qtConfig(thread):!android|android_app:!wasm {
|
||||||
qtHaveModule(quick) {
|
qtHaveModule(quick) {
|
||||||
!static: {
|
!static: {
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
- qmlscene \
|
- qmlscene \
|
||||||
- qmlplugindump \
|
|
||||||
- qmltime
|
- qmltime
|
||||||
+ qmlscene
|
+ qmlscene
|
||||||
}
|
|
||||||
qtHaveModule(widgets): SUBDIRS += qmleasing
|
qtConfig(regularexpression):qtConfig(process) {
|
||||||
}
|
SUBDIRS += \
|
||||||
|
@ -1,44 +1,24 @@
|
|||||||
qtdeclarative_generated.patch
|
qtdeclarative_generated.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
diff --git a/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsgrammar_p.h b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsgrammar_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ab3ad73
|
||||||
---
|
--- /dev/null
|
||||||
.../QtQml/5.8.0/QtQml/private/qtqml-config_p.h | 1 +
|
+++ b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsgrammar_p.h
|
||||||
qtdeclarative/include/QtQml/QtQmlDepends | 5 +++++
|
@@ -0,0 +1 @@
|
||||||
qtdeclarative/include/QtQml/qtqml-config.h | 1 +
|
+#include "../../../../../src/qml/qqmljsgrammar_p.h"
|
||||||
.../include/QtQmlDevTools/QtQmlDevToolsDepends | 4 ++++
|
diff --git a/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsparser_p.h b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsparser_p.h
|
||||||
.../5.8.0/QtQuick/private/qtquick-config_p.h | 1 +
|
new file mode 100644
|
||||||
qtdeclarative/include/QtQuick/QtQuickDepends | 6 ++++++
|
index 0000000..deb9e72
|
||||||
qtdeclarative/include/QtQuick/qtquick-config.h | 1 +
|
--- /dev/null
|
||||||
.../QtQuickParticles/QtQuickParticlesDepends | 7 +++++++
|
+++ b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsparser_p.h
|
||||||
.../include/QtQuickTest/QtQuickTestDepends | 6 ++++++
|
@@ -0,0 +1 @@
|
||||||
.../include/QtQuickWidgets/QtQuickWidgetsDepends | 8 ++++++++
|
+#include "../../../../../src/qml/qqmljsparser_p.h"
|
||||||
qtdeclarative/src/qml/qtqml-config.h | 1 +
|
diff --git a/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qtqml-config_p.h b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qtqml-config_p.h
|
||||||
qtdeclarative/src/qml/qtqml-config_p.h | 1 +
|
|
||||||
qtdeclarative/src/quick/qtquick-config.h | 1 +
|
|
||||||
qtdeclarative/src/quick/qtquick-config_p.h | 13 +++++++++++++
|
|
||||||
14 files changed, 56 insertions(+)
|
|
||||||
create mode 100644 qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h
|
|
||||||
create mode 100644 qtdeclarative/include/QtQml/QtQmlDepends
|
|
||||||
create mode 100644 qtdeclarative/include/QtQml/qtqml-config.h
|
|
||||||
create mode 100644 qtdeclarative/include/QtQmlDevTools/QtQmlDevToolsDepends
|
|
||||||
create mode 100644 qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h
|
|
||||||
create mode 100644 qtdeclarative/include/QtQuick/QtQuickDepends
|
|
||||||
create mode 100644 qtdeclarative/include/QtQuick/qtquick-config.h
|
|
||||||
create mode 100644 qtdeclarative/include/QtQuickParticles/QtQuickParticlesDepends
|
|
||||||
create mode 100644 qtdeclarative/include/QtQuickTest/QtQuickTestDepends
|
|
||||||
create mode 100644 qtdeclarative/include/QtQuickWidgets/QtQuickWidgetsDepends
|
|
||||||
create mode 100644 qtdeclarative/src/qml/qtqml-config.h
|
|
||||||
create mode 100644 qtdeclarative/src/qml/qtqml-config_p.h
|
|
||||||
create mode 100644 qtdeclarative/src/quick/qtquick-config.h
|
|
||||||
create mode 100644 qtdeclarative/src/quick/qtquick-config_p.h
|
|
||||||
|
|
||||||
diff --git a/qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h b/qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h
|
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..1fdbd71
|
index 0000000..1fdbd71
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h
|
+++ b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qtqml-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/qml/qtqml-config_p.h"
|
+#include "../../../../../src/qml/qtqml-config_p.h"
|
||||||
diff --git a/qtdeclarative/include/QtQml/QtQmlDepends b/qtdeclarative/include/QtQml/QtQmlDepends
|
diff --git a/qtdeclarative/include/QtQml/QtQmlDepends b/qtdeclarative/include/QtQml/QtQmlDepends
|
||||||
@ -59,21 +39,11 @@ index 0000000..48fe1f2
|
|||||||
+++ b/qtdeclarative/include/QtQml/qtqml-config.h
|
+++ b/qtdeclarative/include/QtQml/qtqml-config.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../src/qml/qtqml-config.h"
|
+#include "../../src/qml/qtqml-config.h"
|
||||||
diff --git a/qtdeclarative/include/QtQmlDevTools/QtQmlDevToolsDepends b/qtdeclarative/include/QtQmlDevTools/QtQmlDevToolsDepends
|
diff --git a/qtdeclarative/include/QtQuick/5.13.0/QtQuick/private/qtquick-config_p.h b/qtdeclarative/include/QtQuick/5.13.0/QtQuick/private/qtquick-config_p.h
|
||||||
new file mode 100644
|
|
||||||
index 0000000..a040297
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/qtdeclarative/include/QtQmlDevTools/QtQmlDevToolsDepends
|
|
||||||
@@ -0,0 +1,4 @@
|
|
||||||
+/* This file was generated by qmake with the info from <root>/src/qmldevtools/qmldevtools.pro. */
|
|
||||||
+#ifdef __cplusplus /* create empty PCH in C mode */
|
|
||||||
+#include <QtCore/QtCore>
|
|
||||||
+#endif
|
|
||||||
diff --git a/qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h b/qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h
|
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..fcdf423
|
index 0000000..fcdf423
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h
|
+++ b/qtdeclarative/include/QtQuick/5.13.0/QtQuick/private/qtquick-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
||||||
+#include "../../../../../src/quick/qtquick-config_p.h"
|
+#include "../../../../../src/quick/qtquick-config_p.h"
|
||||||
diff --git a/qtdeclarative/include/QtQuick/QtQuickDepends b/qtdeclarative/include/QtQuick/QtQuickDepends
|
diff --git a/qtdeclarative/include/QtQuick/QtQuickDepends b/qtdeclarative/include/QtQuick/QtQuickDepends
|
||||||
@ -108,6 +78,19 @@ index 0000000..ae06770
|
|||||||
+#include <QtQml/QtQml>
|
+#include <QtQml/QtQml>
|
||||||
+#include <QtQuick/QtQuick>
|
+#include <QtQuick/QtQuick>
|
||||||
+#endif
|
+#endif
|
||||||
|
diff --git a/qtdeclarative/include/QtQuickShapes/QtQuickShapesDepends b/qtdeclarative/include/QtQuickShapes/QtQuickShapesDepends
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..f1be23e
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtdeclarative/include/QtQuickShapes/QtQuickShapesDepends
|
||||||
|
@@ -0,0 +1,7 @@
|
||||||
|
+/* This file was generated by qmake with the info from <root>/src/quickshapes/quickshapes.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
|
+#include <QtCore/QtCore>
|
||||||
|
+#include <QtGui/QtGui>
|
||||||
|
+#include <QtQml/QtQml>
|
||||||
|
+#include <QtQuick/QtQuick>
|
||||||
|
+#endif
|
||||||
diff --git a/qtdeclarative/include/QtQuickTest/QtQuickTestDepends b/qtdeclarative/include/QtQuickTest/QtQuickTestDepends
|
diff --git a/qtdeclarative/include/QtQuickTest/QtQuickTestDepends b/qtdeclarative/include/QtQuickTest/QtQuickTestDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..a2d1dcf
|
index 0000000..a2d1dcf
|
||||||
@ -134,20 +117,41 @@ index 0000000..6b0980a
|
|||||||
+#include <QtQuick/QtQuick>
|
+#include <QtQuick/QtQuick>
|
||||||
+#include <QtWidgets/QtWidgets>
|
+#include <QtWidgets/QtWidgets>
|
||||||
+#endif
|
+#endif
|
||||||
|
diff --git a/qtdeclarative/src/qml/qml_compile_hash_p.h b/qtdeclarative/src/qml/qml_compile_hash_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..55c2602
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtdeclarative/src/qml/qml_compile_hash_p.h
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+// Generated file, DO NOT EDIT
|
||||||
|
+#define QML_COMPILE_HASH "ecc092fa5519e77a47ef560f0137b4cd5f417c5e"
|
||||||
|
+#define QML_COMPILE_HASH_LENGTH 40
|
||||||
diff --git a/qtdeclarative/src/qml/qtqml-config.h b/qtdeclarative/src/qml/qtqml-config.h
|
diff --git a/qtdeclarative/src/qml/qtqml-config.h b/qtdeclarative/src/qml/qtqml-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..299465e
|
index 0000000..e04a385
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtdeclarative/src/qml/qtqml-config.h
|
+++ b/qtdeclarative/src/qml/qtqml-config.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1,2 @@
|
||||||
|
+#define QT_FEATURE_qml_debug -1
|
||||||
+#define QT_FEATURE_qml_network 1
|
+#define QT_FEATURE_qml_network 1
|
||||||
diff --git a/qtdeclarative/src/qml/qtqml-config_p.h b/qtdeclarative/src/qml/qtqml-config_p.h
|
diff --git a/qtdeclarative/src/qml/qtqml-config_p.h b/qtdeclarative/src/qml/qtqml-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..d5578b9
|
index 0000000..190ec50
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtdeclarative/src/qml/qtqml-config_p.h
|
+++ b/qtdeclarative/src/qml/qtqml-config_p.h
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1,12 @@
|
||||||
+#define QT_FEATURE_qml_interpreter 1
|
+#define QT_FEATURE_cxx14_make_unique 1
|
||||||
|
+#define QT_FEATURE_qml_animation 1
|
||||||
|
+#define QT_FEATURE_qml_delegate_model 1
|
||||||
|
+#define QT_FEATURE_qml_devtools 1
|
||||||
|
+#define QT_FEATURE_qml_list_model 1
|
||||||
|
+#define QT_FEATURE_qml_locale 1
|
||||||
|
+#define QT_FEATURE_qml_preview -1
|
||||||
|
+#define QT_FEATURE_qml_profiler -1
|
||||||
|
+#define QT_FEATURE_qml_sequence_object 1
|
||||||
|
+#define QT_FEATURE_qml_tracing -1
|
||||||
|
+#define QT_FEATURE_qml_worker_script 1
|
||||||
|
+#define QT_FEATURE_qml_xml_http_request 1
|
||||||
diff --git a/qtdeclarative/src/quick/qtquick-config.h b/qtdeclarative/src/quick/qtquick-config.h
|
diff --git a/qtdeclarative/src/quick/qtquick-config.h b/qtdeclarative/src/quick/qtquick-config.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..a224374
|
index 0000000..a224374
|
||||||
@ -157,20 +161,23 @@ index 0000000..a224374
|
|||||||
+#define QT_FEATURE_d3d12 -1
|
+#define QT_FEATURE_d3d12 -1
|
||||||
diff --git a/qtdeclarative/src/quick/qtquick-config_p.h b/qtdeclarative/src/quick/qtquick-config_p.h
|
diff --git a/qtdeclarative/src/quick/qtquick-config_p.h b/qtdeclarative/src/quick/qtquick-config_p.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..6f3febe
|
index 0000000..9c6e6e0
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtdeclarative/src/quick/qtquick-config_p.h
|
+++ b/qtdeclarative/src/quick/qtquick-config_p.h
|
||||||
@@ -0,0 +1,13 @@
|
@@ -0,0 +1,16 @@
|
||||||
+#define QT_FEATURE_quick_animatedimage 1
|
+#define QT_FEATURE_quick_animatedimage 1
|
||||||
|
+#define QT_FEATURE_quick_shadereffect 1
|
||||||
|
+#define QT_FEATURE_quick_path 1
|
||||||
+#define QT_FEATURE_quick_canvas 1
|
+#define QT_FEATURE_quick_canvas 1
|
||||||
+#define QT_FEATURE_quick_designer 1
|
+#define QT_FEATURE_quick_designer 1
|
||||||
+#define QT_FEATURE_quick_flipable 1
|
+#define QT_FEATURE_quick_flipable 1
|
||||||
+#define QT_FEATURE_quick_gridview 1
|
+#define QT_FEATURE_quick_gridview 1
|
||||||
+#define QT_FEATURE_quick_itemview 1
|
+#define QT_FEATURE_quick_itemview 1
|
||||||
+#define QT_FEATURE_quick_listview 1
|
+#define QT_FEATURE_quick_listview 1
|
||||||
+#define QT_FEATURE_quick_path 1
|
+#define QT_FEATURE_quick_sprite 1
|
||||||
|
+#define QT_FEATURE_quick_particles 1
|
||||||
+#define QT_FEATURE_quick_pathview 1
|
+#define QT_FEATURE_quick_pathview 1
|
||||||
+#define QT_FEATURE_quick_positioners 1
|
+#define QT_FEATURE_quick_positioners 1
|
||||||
+#define QT_FEATURE_quick_shadereffect 1
|
+#define QT_FEATURE_quick_repeater 1
|
||||||
+#define QT_FEATURE_quick_sprite 1
|
+#define QT_FEATURE_quick_tableview 1
|
||||||
+#define QT_FEATURE_quick_viewtransitions 1
|
+#define QT_FEATURE_quick_viewtransitions 1
|
||||||
|
@ -1,44 +1,12 @@
|
|||||||
qtdeclarative_genode.patch
|
qtdeclarative_genode.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtdeclarative/src/qml/jsruntime/qv4alloca_p.h | 4 ++++
|
|
||||||
qtdeclarative/src/qml/jsruntime/qv4engine.cpp | 4 ++++
|
|
||||||
qtdeclarative/src/qml/jsruntime/qv4global_p.h | 2 +-
|
|
||||||
qtdeclarative/src/qml/qml/qqmlimport.cpp | 3 +++
|
|
||||||
4 files changed, 12 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h
|
|
||||||
index 2f48698..5c153bd 100644
|
|
||||||
--- a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h
|
|
||||||
+++ b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h
|
|
||||||
@@ -53,6 +53,7 @@
|
|
||||||
|
|
||||||
#include <qglobal.h>
|
|
||||||
|
|
||||||
+#ifndef Q_OS_GENODE
|
|
||||||
#if defined(Q_OS_WIN)
|
|
||||||
# include <malloc.h>
|
|
||||||
# ifndef __GNUC__
|
|
||||||
@@ -60,6 +61,9 @@
|
|
||||||
# endif
|
|
||||||
#elif !defined(Q_OS_BSD4) || defined(Q_OS_DARWIN)
|
|
||||||
# include <alloca.h>
|
|
||||||
+#else
|
|
||||||
+# include <alloca.h>
|
|
||||||
+#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff --git a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp
|
diff --git a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp
|
||||||
index a9284f2..6f8be87 100644
|
index f5c5c49..1d70dce 100644
|
||||||
--- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp
|
--- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp
|
||||||
+++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp
|
+++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp
|
||||||
@@ -102,6 +102,10 @@
|
@@ -133,6 +133,10 @@
|
||||||
#include <valgrind/memcheck.h>
|
|
||||||
#endif
|
#endif // #ifndef V4_BOOTSTRAP
|
||||||
|
|
||||||
+#if defined(Q_OS_GENODE)
|
+#if defined(Q_OS_GENODE)
|
||||||
+#include <base/thread.h>
|
+#include <base/thread.h>
|
||||||
@ -46,12 +14,12 @@ index a9284f2..6f8be87 100644
|
|||||||
+
|
+
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
using namespace QV4;
|
Q_LOGGING_CATEGORY(lcTracingAll, "qt.v4.tracing.all")
|
||||||
diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
||||||
index 184375a..597c680 100644
|
index d47393b..f0123b3 100644
|
||||||
--- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
--- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
||||||
+++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
+++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
||||||
@@ -113,7 +113,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
|
@@ -116,7 +116,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
|
||||||
|
|
||||||
// Black list some platforms
|
// Black list some platforms
|
||||||
#if defined(V4_ENABLE_JIT)
|
#if defined(V4_ENABLE_JIT)
|
||||||
@ -61,10 +29,10 @@ index 184375a..597c680 100644
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp
|
diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp
|
||||||
index 98e2f9e..89bd563 100644
|
index 5a13644..2b8c225 100644
|
||||||
--- a/qtdeclarative/src/qml/qml/qqmlimport.cpp
|
--- a/qtdeclarative/src/qml/qml/qqmlimport.cpp
|
||||||
+++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp
|
+++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp
|
||||||
@@ -1747,6 +1747,9 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader,
|
@@ -1913,6 +1913,9 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader,
|
||||||
QLatin1String(".so"),
|
QLatin1String(".so"),
|
||||||
QLatin1String(".bundle")
|
QLatin1String(".bundle")
|
||||||
};
|
};
|
||||||
|
@ -1,21 +1,5 @@
|
|||||||
qtscriptclassic_qt5.patch
|
qtscriptclassic_qt5.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
src/qscriptcontextinfo.cpp | 2 -
|
|
||||||
src/qscriptecmafunction.cpp | 12 ++++-----
|
|
||||||
src/qscriptengine_p.cpp | 30 ++++++++++++++--------
|
|
||||||
src/qscriptextqobject.cpp | 52 +++++++++++++++++---------------------
|
|
||||||
src/qscriptstring.cpp | 1 -
|
|
||||||
src/qscriptsyntaxcheckresult_p.h | 2 +
|
|
||||||
src/qscriptvalue.cpp | 4 +--
|
|
||||||
src/qscriptvalue.h | 4 +--
|
|
||||||
src/qscriptvalue_p.h | 1 -
|
|
||||||
src/qscriptvalueimpl_p.h | 3 +-
|
|
||||||
10 files changed, 55 insertions(+), 56 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qscriptcontextinfo.cpp b/src/qscriptcontextinfo.cpp
|
diff --git a/src/qscriptcontextinfo.cpp b/src/qscriptcontextinfo.cpp
|
||||||
index ef080ff..df0e555 100644
|
index ef080ff..df0e555 100644
|
||||||
--- a/src/qscriptcontextinfo.cpp
|
--- a/src/qscriptcontextinfo.cpp
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
qtscriptclassic_qt5_7.patch
|
qtscriptclassic_qt5_7.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
src/qscriptengine_p.cpp | 9 +++------
|
|
||||||
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qscriptengine_p.cpp b/src/qscriptengine_p.cpp
|
diff --git a/src/qscriptengine_p.cpp b/src/qscriptengine_p.cpp
|
||||||
index 4e9076d..65ffcf0 100644
|
index 4e9076d..65ffcf0 100644
|
||||||
--- a/src/qscriptengine_p.cpp
|
--- a/src/qscriptengine_p.cpp
|
||||||
|
@ -1,13 +1,5 @@
|
|||||||
qtsvg_generated.patch
|
qtsvg_generated.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtsvg/include/QtSvg/QtSvgDepends | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
create mode 100644 qtsvg/include/QtSvg/QtSvgDepends
|
|
||||||
|
|
||||||
diff --git a/qtsvg/include/QtSvg/QtSvgDepends b/qtsvg/include/QtSvg/QtSvgDepends
|
diff --git a/qtsvg/include/QtSvg/QtSvgDepends b/qtsvg/include/QtSvg/QtSvgDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..a4800e1
|
index 0000000..a4800e1
|
||||||
|
@ -1,14 +1,5 @@
|
|||||||
qttools_configuration.patch
|
qttools_configuration.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qttools/src/designer/src/lib/lib.pro | 4 ++--
|
|
||||||
qttools/src/designer/src/src.pro | 4 +---
|
|
||||||
qttools/src/src.pro | 2 +-
|
|
||||||
3 files changed, 4 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro
|
diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro
|
||||||
index de0dc73..c294782 100644
|
index de0dc73..c294782 100644
|
||||||
--- a/qttools/src/designer/src/lib/lib.pro
|
--- a/qttools/src/designer/src/lib/lib.pro
|
||||||
@ -25,30 +16,28 @@ index de0dc73..c294782 100644
|
|||||||
PRECOMPILED_HEADER=lib_pch.h
|
PRECOMPILED_HEADER=lib_pch.h
|
||||||
|
|
||||||
diff --git a/qttools/src/designer/src/src.pro b/qttools/src/designer/src/src.pro
|
diff --git a/qttools/src/designer/src/src.pro b/qttools/src/designer/src/src.pro
|
||||||
index 6915e34..8a3fcc2 100644
|
index 79e9e64..bee94b6 100644
|
||||||
--- a/qttools/src/designer/src/src.pro
|
--- a/qttools/src/designer/src/src.pro
|
||||||
+++ b/qttools/src/designer/src/src.pro
|
+++ b/qttools/src/designer/src/src.pro
|
||||||
@@ -3,9 +3,7 @@ TEMPLATE = subdirs
|
@@ -7,8 +7,6 @@ SUBDIRS = \
|
||||||
SUBDIRS = \
|
qtConfig(process) {
|
||||||
uiplugin \
|
SUBDIRS += \
|
||||||
uitools \
|
lib \
|
||||||
- lib \
|
|
||||||
- components \
|
- components \
|
||||||
- designer
|
- designer
|
||||||
+ lib
|
|
||||||
|
|
||||||
contains(QT_CONFIG, shared): SUBDIRS += plugins
|
|
||||||
|
|
||||||
|
lib.depends = uiplugin
|
||||||
|
components.depends = lib
|
||||||
diff --git a/qttools/src/src.pro b/qttools/src/src.pro
|
diff --git a/qttools/src/src.pro b/qttools/src/src.pro
|
||||||
index db6fe0c..bc5c5dd 100644
|
index 5c256ea..a7edd3b 100644
|
||||||
--- a/qttools/src/src.pro
|
--- a/qttools/src/src.pro
|
||||||
+++ b/qttools/src/src.pro
|
+++ b/qttools/src/src.pro
|
||||||
@@ -12,7 +12,7 @@ qtHaveModule(widgets) {
|
@@ -16,7 +16,7 @@ qtHaveModule(widgets) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-SUBDIRS += linguist \
|
-SUBDIRS += linguist \
|
||||||
+SUBDIRS += \
|
+SUBDIRS += \
|
||||||
qdoc \
|
|
||||||
qtattributionsscanner
|
qtattributionsscanner
|
||||||
|
|
||||||
|
qtConfig(library) {
|
||||||
|
@ -1,18 +1,14 @@
|
|||||||
qttools_generated.patch
|
qttools_generated.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qttools/include/QtUiTools/QtUiToolsDepends | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
create mode 100644 qttools/include/QtUiTools/QtUiToolsDepends
|
|
||||||
|
|
||||||
diff --git a/qttools/include/QtUiTools/QtUiToolsDepends b/qttools/include/QtUiTools/QtUiToolsDepends
|
diff --git a/qttools/include/QtUiTools/QtUiToolsDepends b/qttools/include/QtUiTools/QtUiToolsDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..2c0063e
|
index 0000000..fc2ca80
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qttools/include/QtUiTools/QtUiToolsDepends
|
+++ b/qttools/include/QtUiTools/QtUiToolsDepends
|
||||||
@@ -0,0 +1,2 @@
|
@@ -0,0 +1,6 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/src/designer/src/uitools/uitools.pro. */
|
+/* This file was generated by qmake with the info from <root>/src/designer/src/uitools/uitools.pro. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
|
+#include <QtGui/QtGui>
|
||||||
|
+#include <QtWidgets/QtWidgets>
|
||||||
|
+#endif
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
qtvirtualkeyboard_configuration.patch
|
||||||
|
|
||||||
|
diff --git a/qtvirtualkeyboard/src/config.pri b/qtvirtualkeyboard/src/config.pri
|
||||||
|
index 435ae5e..839f62c 100644
|
||||||
|
--- a/qtvirtualkeyboard/src/config.pri
|
||||||
|
+++ b/qtvirtualkeyboard/src/config.pri
|
||||||
|
@@ -43,7 +43,7 @@ disable-layouts {
|
||||||
|
thai: CONFIG += lang-th_TH
|
||||||
|
|
||||||
|
# Use all languages by default
|
||||||
|
- !contains(CONFIG, lang-.*): CONFIG += lang-all
|
||||||
|
+ !contains(CONFIG, lang-.*): CONFIG += lang-en_GB
|
||||||
|
|
||||||
|
# Flag for activating all languages
|
||||||
|
lang-all: CONFIG += \
|
||||||
|
diff --git a/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro b/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro
|
||||||
|
index cb28d6a..e832d66 100644
|
||||||
|
--- a/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro
|
||||||
|
+++ b/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro
|
||||||
|
@@ -405,10 +405,10 @@ OTHER_FILES += \
|
||||||
|
SOURCES += desktopinputpanel.cpp inputview.cpp
|
||||||
|
HEADERS += desktopinputpanel_p.h inputview_p.h
|
||||||
|
DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
|
||||||
|
- !no-pkg-config:packagesExist(xcb) {
|
||||||
|
- PKGCONFIG += xcb xcb-xfixes
|
||||||
|
- DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
|
||||||
|
- }
|
||||||
|
+# !no-pkg-config:packagesExist(xcb) {
|
||||||
|
+# PKGCONFIG += xcb xcb-xfixes
|
||||||
|
+# DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
|
||||||
|
+# }
|
||||||
|
}
|
||||||
|
|
||||||
|
record-trace-input {
|
@ -0,0 +1,22 @@
|
|||||||
|
qtvirtualkeyboard_generated.patch
|
||||||
|
|
||||||
|
diff --git a/qtvirtualkeyboard/src/virtualkeyboard/qmake_virtualkeyboard_layouts.qrc b/qtvirtualkeyboard/src/virtualkeyboard/qmake_virtualkeyboard_layouts.qrc
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..a6e60dc
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/qtvirtualkeyboard/src/virtualkeyboard/qmake_virtualkeyboard_layouts.qrc
|
||||||
|
@@ -0,0 +1,14 @@
|
||||||
|
+<!DOCTYPE RCC><RCC version="1.0">
|
||||||
|
+<qresource prefix="/QtQuick/VirtualKeyboard">
|
||||||
|
+<file alias="content/layouts/fallback/dialpad.qml">content/layouts/fallback/dialpad.qml</file>
|
||||||
|
+<file alias="content/layouts/fallback/digits.qml">content/layouts/fallback/digits.qml</file>
|
||||||
|
+<file alias="content/layouts/fallback/numbers.qml">content/layouts/fallback/numbers.qml</file>
|
||||||
|
+<file alias="content/layouts/fallback/main.qml">content/layouts/fallback/main.qml</file>
|
||||||
|
+<file alias="content/layouts/fallback/symbols.qml">content/layouts/fallback/symbols.qml</file>
|
||||||
|
+<file alias="content/layouts/en_GB/dialpad.fallback">content/layouts/en_GB/dialpad.fallback</file>
|
||||||
|
+<file alias="content/layouts/en_GB/digits.fallback">content/layouts/en_GB/digits.fallback</file>
|
||||||
|
+<file alias="content/layouts/en_GB/main.fallback">content/layouts/en_GB/main.fallback</file>
|
||||||
|
+<file alias="content/layouts/en_GB/numbers.fallback">content/layouts/en_GB/numbers.fallback</file>
|
||||||
|
+<file alias="content/layouts/en_GB/symbols.fallback">content/layouts/en_GB/symbols.fallback</file>
|
||||||
|
+</qresource>
|
||||||
|
+</RCC>
|
@ -1,16 +1,22 @@
|
|||||||
qtwebkit_configuration.patch
|
qtwebkit_configuration.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
diff --git a/.gitmodules b/.gitmodules
|
||||||
|
index 008555c..0cea9ba 100644
|
||||||
|
--- a/.gitmodules
|
||||||
---
|
+++ b/.gitmodules
|
||||||
.../Tools/qmake/mkspecs/features/configure.prf | 1 -
|
@@ -385,4 +385,8 @@
|
||||||
qtwebkit/Tools/qmake/mkspecs/features/features.prf | 22 ++++++++++----------
|
path = qtcoap
|
||||||
qtwebkit/Tools/qmake/mkspecs/features/features.pri | 2 +-
|
url = ../qtcoap.git
|
||||||
3 files changed, 12 insertions(+), 13 deletions(-)
|
branch = 5.13.0
|
||||||
|
- status = preview
|
||||||
|
\ No newline at end of file
|
||||||
|
+ status = preview
|
||||||
|
+[submodule "qtwebkit"]
|
||||||
|
+ depends = qtbase
|
||||||
|
+ path = qtwebkit
|
||||||
|
+ project = WebKit.pro
|
||||||
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
||||||
index 9eeac75..8e8259c 100644
|
index 23d9904..6ea194f 100644
|
||||||
--- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
--- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
||||||
+++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
+++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
||||||
@@ -49,7 +49,6 @@ defineTest(runConfigure) {
|
@@ -49,7 +49,6 @@ defineTest(runConfigure) {
|
||||||
@ -22,7 +28,7 @@ index 9eeac75..8e8259c 100644
|
|||||||
$$WEBKIT_TOOLS_CONFIG
|
$$WEBKIT_TOOLS_CONFIG
|
||||||
|
|
||||||
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
|
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
|
||||||
index 328a8be..096d8ef 100644
|
index 328a8be..91e2c07 100644
|
||||||
--- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf
|
--- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf
|
||||||
+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
|
+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
|
||||||
@@ -37,14 +37,14 @@ defineTest(detectFeatures) {
|
@@ -37,14 +37,14 @@ defineTest(detectFeatures) {
|
||||||
@ -47,6 +53,20 @@ index 328a8be..096d8ef 100644
|
|||||||
|
|
||||||
# We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt
|
# We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt
|
||||||
# is using the system libraries, use them to take advantage of the WebCore image decoders as well.
|
# is using the system libraries, use them to take advantage of the WebCore image decoders as well.
|
||||||
|
@@ -56,10 +56,10 @@ defineTest(detectFeatures) {
|
||||||
|
else: CONFIGURE_WARNINGS += "Qt not configured to use system libpng, QImageDecoder will decode PNG images"
|
||||||
|
|
||||||
|
linux-* {
|
||||||
|
- config_libXcomposite: WEBKIT_CONFIG += have_xcomposite
|
||||||
|
- config_libXrender: WEBKIT_CONFIG += have_xrender
|
||||||
|
+ #config_libXcomposite: WEBKIT_CONFIG += have_xcomposite
|
||||||
|
+ #config_libXrender: WEBKIT_CONFIG += have_xrender
|
||||||
|
|
||||||
|
- config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx
|
||||||
|
+ #config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx
|
||||||
|
|
||||||
|
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
|
||||||
|
config_fontconfig: WEBKIT_CONFIG += have_fontconfig
|
||||||
@@ -109,9 +109,9 @@ defineTest(detectFeatures) {
|
@@ -109,9 +109,9 @@ defineTest(detectFeatures) {
|
||||||
use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
|
use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
|
||||||
}
|
}
|
||||||
@ -82,3 +102,27 @@ index ba18b35..dd27a42 100644
|
|||||||
ENABLE_INPUT_SPEECH=0 \
|
ENABLE_INPUT_SPEECH=0 \
|
||||||
ENABLE_INPUT_TYPE_COLOR=1 \
|
ENABLE_INPUT_TYPE_COLOR=1 \
|
||||||
ENABLE_INPUT_TYPE_DATE=0 \
|
ENABLE_INPUT_TYPE_DATE=0 \
|
||||||
|
diff --git a/qtwebkit/include/QtWebKit/headers.pri b/qtwebkit/include/QtWebKit/headers.pri
|
||||||
|
index 6775f3a..8b4aff7 100644
|
||||||
|
--- a/qtwebkit/include/QtWebKit/headers.pri
|
||||||
|
+++ b/qtwebkit/include/QtWebKit/headers.pri
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
-SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit
|
||||||
|
-SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion
|
||||||
|
+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h qtwebkitversion.h QtWebKit
|
||||||
|
+SYNCQT.GENERATED_HEADER_FILES = QWebDatabase QWebElement QWebElementCollection QWebHistoryItem QWebHistory QWebHistoryInterface QWebSelectData QWebSelectMethod QWebNotificationData QWebNotificationPresenter QWebHapticFeedbackPlayer QWebTouchModifier QWebFullScreenVideoHandler QWebSpellChecker QWebKitPlatformPlugin QWebPluginFactory QWebSecurityOrigin QWebSettings QtWebKitVersion
|
||||||
|
SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h
|
||||||
|
SYNCQT.INJECTED_PRIVATE_HEADER_FILES =
|
||||||
|
SYNCQT.QPA_HEADER_FILES =
|
||||||
|
diff --git a/qtwebkit/include/QtWebKitWidgets/headers.pri b/qtwebkit/include/QtWebKitWidgets/headers.pri
|
||||||
|
index 9d386e2..8d11b79 100644
|
||||||
|
--- a/qtwebkit/include/QtWebKitWidgets/headers.pri
|
||||||
|
+++ b/qtwebkit/include/QtWebKitWidgets/headers.pri
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
-SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets
|
||||||
|
-SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion
|
||||||
|
+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h qtwebkitwidgetsversion.h QtWebKitWidgets
|
||||||
|
+SYNCQT.GENERATED_HEADER_FILES = QGraphicsWebView QWebHitTestResult QWebFrame QWebInspector QWebPage QWebView QtWebKitWidgetsVersion
|
||||||
|
SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h
|
||||||
|
SYNCQT.INJECTED_PRIVATE_HEADER_FILES =
|
||||||
|
SYNCQT.QPA_HEADER_FILES =
|
||||||
|
@ -1,14 +1,5 @@
|
|||||||
qtwebkit_fixes.patch
|
qtwebkit_fixes.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
.../platform/network/NetworkStateNotifier.h | 4 ++--
|
|
||||||
.../platform/network/qt/NetworkStateNotifierQt.cpp | 3 +++
|
|
||||||
qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp | 3 ++-
|
|
||||||
3 files changed, 7 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h b/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h
|
diff --git a/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h b/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h
|
||||||
index 6edc5b7..e09917b 100644
|
index 6edc5b7..e09917b 100644
|
||||||
--- a/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h
|
--- a/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h
|
||||||
@ -45,6 +36,25 @@ index 61e4e6e..5957df8 100644
|
|||||||
#if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT))
|
#if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT))
|
||||||
|
|
||||||
#include "NetworkStateNotifierPrivate.h"
|
#include "NetworkStateNotifierPrivate.h"
|
||||||
|
diff --git a/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp b/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp
|
||||||
|
index aaca428..38558c2 100644
|
||||||
|
--- a/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp
|
||||||
|
+++ b/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp
|
||||||
|
@@ -137,8 +137,12 @@ void stopSharedTimer()
|
||||||
|
SharedTimerQt::inst()->stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
-#include "SharedTimerQt.moc"
|
||||||
|
-
|
||||||
|
}
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * moc 5.13.0 generates '#include <memory>' in SharedTimerQt.moc, which
|
||||||
|
+ * triggers compile errors when included within the namespace
|
||||||
|
+ */
|
||||||
|
+#include "SharedTimerQt.moc"
|
||||||
|
+
|
||||||
|
// vim: ts=4 sw=4 et
|
||||||
diff --git a/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp b/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp
|
diff --git a/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp b/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp
|
||||||
index d3a8642..c4e4aa1 100644
|
index d3a8642..c4e4aa1 100644
|
||||||
--- a/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp
|
--- a/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp
|
||||||
|
@ -1,35 +1,28 @@
|
|||||||
qtwebkit_generated.patch
|
qtwebkit_generated.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
qtwebkit/include/QtWebKit/QtWebKitDepends | 4 ++++
|
|
||||||
.../include/QtWebKitWidgets/QtWebKitWidgetsDepends | 7 +++++++
|
|
||||||
2 files changed, 11 insertions(+)
|
|
||||||
create mode 100644 qtwebkit/include/QtWebKit/QtWebKitDepends
|
|
||||||
create mode 100644 qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends
|
|
||||||
|
|
||||||
diff --git a/qtwebkit/include/QtWebKit/QtWebKitDepends b/qtwebkit/include/QtWebKit/QtWebKitDepends
|
diff --git a/qtwebkit/include/QtWebKit/QtWebKitDepends b/qtwebkit/include/QtWebKit/QtWebKitDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..1b3f8ad
|
index 0000000..bb9610b
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtwebkit/include/QtWebKit/QtWebKitDepends
|
+++ b/qtwebkit/include/QtWebKit/QtWebKitDepends
|
||||||
@@ -0,0 +1,4 @@
|
@@ -0,0 +1,6 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/Source/api.pri. */
|
+/* This file was generated by qmake with the info from <root>/Source/api.pri. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
+#include <QtGui/QtGui>
|
+#include <QtGui/QtGui>
|
||||||
+#include <QtNetwork/QtNetwork>
|
+#include <QtNetwork/QtNetwork>
|
||||||
|
+#endif
|
||||||
diff --git a/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends
|
diff --git a/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..672bd42
|
index 0000000..9072063
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends
|
+++ b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends
|
||||||
@@ -0,0 +1,7 @@
|
@@ -0,0 +1,8 @@
|
||||||
+/* This file was generated by qmake with the info from <root>/Source/widgetsapi.pri. */
|
+/* This file was generated by qmake with the info from <root>/Source/widgetsapi.pri. */
|
||||||
|
+#ifdef __cplusplus /* create empty PCH in C mode */
|
||||||
+#include <QtCore/QtCore>
|
+#include <QtCore/QtCore>
|
||||||
+#include <QtGui/QtGui>
|
+#include <QtGui/QtGui>
|
||||||
+#include <QtNetwork/QtNetwork>
|
|
||||||
+#include <QtWidgets/QtWidgets>
|
+#include <QtWidgets/QtWidgets>
|
||||||
+#include <QtPrintSupport/QtPrintSupport>
|
+#include <QtNetwork/QtNetwork>
|
||||||
+#include <QtWebKit/QtWebKit>
|
+#include <QtWebKit/QtWebKit>
|
||||||
|
+#endif
|
||||||
|
@ -1,27 +1,5 @@
|
|||||||
qtwebkit_genode.patch
|
qtwebkit_genode.patch
|
||||||
|
|
||||||
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
.../Source/JavaScriptCore/assembler/ARMAssembler.h | 7 +++++++
|
|
||||||
.../JavaScriptCore/assembler/MacroAssemblerARM.cpp | 3 ++-
|
|
||||||
.../Source/JavaScriptCore/dfg/DFGOperations.cpp | 1 +
|
|
||||||
.../JavaScriptCore/jit/ExecutableAllocator.h | 8 ++++++++
|
|
||||||
qtwebkit/Source/WTF/wtf/Assertions.cpp | 9 +++++++++
|
|
||||||
qtwebkit/Source/WTF/wtf/FastMalloc.cpp | 2 +-
|
|
||||||
qtwebkit/Source/WTF/wtf/InlineASM.h | 4 ++--
|
|
||||||
qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp | 20 ++++++++++++++++++++
|
|
||||||
qtwebkit/Source/WTF/wtf/OSRandomSource.cpp | 8 ++++++++
|
|
||||||
qtwebkit/Source/WTF/wtf/Platform.h | 19 +++++++++++++++----
|
|
||||||
qtwebkit/Source/WTF/wtf/StackBounds.cpp | 13 +++++++++++++
|
|
||||||
qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp | 20 ++++++++++++++++++++
|
|
||||||
.../front-end/InspectorBackendCommands.qrc | 2 +-
|
|
||||||
.../platform/graphics/qt/MediaPlayerPrivateQt.cpp | 3 +++
|
|
||||||
.../network/qt/SocketStreamHandlePrivate.h | 1 +
|
|
||||||
.../platform/network/qt/SocketStreamHandleQt.cpp | 14 ++++++++++++++
|
|
||||||
16 files changed, 125 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h
|
diff --git a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h
|
||||||
index 19db71d..9cbe4e3 100644
|
index 19db71d..9cbe4e3 100644
|
||||||
--- a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h
|
--- a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h
|
||||||
@ -137,10 +115,10 @@ index 82fbd25..9791492 100644
|
|||||||
#else
|
#else
|
||||||
#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
|
#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
|
||||||
diff --git a/qtwebkit/Source/WTF/wtf/InlineASM.h b/qtwebkit/Source/WTF/wtf/InlineASM.h
|
diff --git a/qtwebkit/Source/WTF/wtf/InlineASM.h b/qtwebkit/Source/WTF/wtf/InlineASM.h
|
||||||
index 0a2fe78..d1fdd01 100644
|
index 2dc40ef..aeb9ac6 100644
|
||||||
--- a/qtwebkit/Source/WTF/wtf/InlineASM.h
|
--- a/qtwebkit/Source/WTF/wtf/InlineASM.h
|
||||||
+++ b/qtwebkit/Source/WTF/wtf/InlineASM.h
|
+++ b/qtwebkit/Source/WTF/wtf/InlineASM.h
|
||||||
@@ -62,12 +62,12 @@
|
@@ -64,12 +64,12 @@
|
||||||
#elif OS(AIX)
|
#elif OS(AIX)
|
||||||
// IBM's own file format
|
// IBM's own file format
|
||||||
#define HIDE_SYMBOL(name) ".lglobl " #name
|
#define HIDE_SYMBOL(name) ".lglobl " #name
|
||||||
|
@ -3,12 +3,14 @@ qtbase_fixes.patch
|
|||||||
qtbase_configuration.patch
|
qtbase_configuration.patch
|
||||||
qtdeclarative_configuration.patch
|
qtdeclarative_configuration.patch
|
||||||
qttools_configuration.patch
|
qttools_configuration.patch
|
||||||
|
qtvirtualkeyboard_configuration.patch
|
||||||
qtwebkit_fixes.patch
|
qtwebkit_fixes.patch
|
||||||
qtwebkit_configuration.patch
|
qtwebkit_configuration.patch
|
||||||
qtbase_generated.patch
|
qtbase_generated.patch
|
||||||
qtdeclarative_generated.patch
|
qtdeclarative_generated.patch
|
||||||
qtsvg_generated.patch
|
qtsvg_generated.patch
|
||||||
qttools_generated.patch
|
qttools_generated.patch
|
||||||
|
qtvirtualkeyboard_generated.patch
|
||||||
qtwebkit_generated.patch
|
qtwebkit_generated.patch
|
||||||
qtbase_genode.patch
|
qtbase_genode.patch
|
||||||
qtbase_genode_qtscriptclassic.patch
|
qtbase_genode_qtscriptclassic.patch
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#include <private/qcoreapplication_p.h>
|
#include <private/qcoreapplication_p.h>
|
||||||
#include <private/qcore_unix_p.h>
|
#include <private/qcore_unix_p.h>
|
||||||
|
|
||||||
#if defined(Q_OS_OSX)
|
#if defined(Q_OS_DARWIN)
|
||||||
# include <private/qeventdispatcher_cf_p.h>
|
# include <private/qeventdispatcher_cf_p.h>
|
||||||
#else
|
#else
|
||||||
# if !defined(QT_NO_GLIB)
|
# if !defined(QT_NO_GLIB)
|
||||||
@ -61,6 +61,10 @@
|
|||||||
|
|
||||||
#include "qdebug.h"
|
#include "qdebug.h"
|
||||||
|
|
||||||
|
#ifdef __GLIBCXX__
|
||||||
|
#include <cxxabi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef Q_OS_GENODE
|
#ifndef Q_OS_GENODE
|
||||||
#include <sched.h>
|
#include <sched.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
@ -80,19 +84,6 @@
|
|||||||
#include <sys/pstat.h>
|
#include <sys/pstat.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(Q_OS_MAC)
|
|
||||||
# ifdef qDebug
|
|
||||||
# define old_qDebug qDebug
|
|
||||||
# undef qDebug
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef old_qDebug
|
|
||||||
# undef qDebug
|
|
||||||
# define qDebug QT_NO_QDEBUG_MACRO
|
|
||||||
# undef old_qDebug
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
|
#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
|
||||||
#include <sys/prctl.h>
|
#include <sys/prctl.h>
|
||||||
#endif
|
#endif
|
||||||
@ -102,15 +93,19 @@
|
|||||||
# define SCHED_IDLE 5
|
# define SCHED_IDLE 5
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
|
#if defined(Q_OS_DARWIN) || !defined(Q_OS_ANDROID) && !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
|
||||||
#define QT_HAS_THREAD_PRIORITY_SCHEDULING
|
#define QT_HAS_THREAD_PRIORITY_SCHEDULING
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(Q_OS_QNX)
|
||||||
|
#include <sys/neutrino.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
#ifndef QT_NO_THREAD
|
#if QT_CONFIG(thread)
|
||||||
|
|
||||||
#ifdef Q_OS_GENODE
|
#ifdef Q_OS_GENODE
|
||||||
|
|
||||||
@ -247,25 +242,25 @@ static void clear_thread_data()
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
static typename QtPrivate::QEnableIf<QTypeInfo<T>::isIntegral, Qt::HANDLE>::Type to_HANDLE(T id)
|
static typename std::enable_if<QTypeInfo<T>::isIntegral, Qt::HANDLE>::type to_HANDLE(T id)
|
||||||
{
|
{
|
||||||
return reinterpret_cast<Qt::HANDLE>(static_cast<intptr_t>(id));
|
return reinterpret_cast<Qt::HANDLE>(static_cast<intptr_t>(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
static typename QtPrivate::QEnableIf<QTypeInfo<T>::isIntegral, T>::Type from_HANDLE(Qt::HANDLE id)
|
static typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type from_HANDLE(Qt::HANDLE id)
|
||||||
{
|
{
|
||||||
return static_cast<T>(reinterpret_cast<intptr_t>(id));
|
return static_cast<T>(reinterpret_cast<intptr_t>(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
static typename QtPrivate::QEnableIf<QTypeInfo<T>::isPointer, Qt::HANDLE>::Type to_HANDLE(T id)
|
static typename std::enable_if<QTypeInfo<T>::isPointer, Qt::HANDLE>::type to_HANDLE(T id)
|
||||||
{
|
{
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
static typename QtPrivate::QEnableIf<QTypeInfo<T>::isPointer, T>::Type from_HANDLE(Qt::HANDLE id)
|
static typename std::enable_if<QTypeInfo<T>::isPointer, T>::type from_HANDLE(Qt::HANDLE id)
|
||||||
{
|
{
|
||||||
return static_cast<T>(id);
|
return static_cast<T>(id);
|
||||||
}
|
}
|
||||||
@ -292,9 +287,9 @@ QThreadData *QThreadData::current(bool createIfNecessary)
|
|||||||
data->deref();
|
data->deref();
|
||||||
data->isAdopted = true;
|
data->isAdopted = true;
|
||||||
#ifdef Q_OS_GENODE
|
#ifdef Q_OS_GENODE
|
||||||
data->threadId = QThread::currentThreadId();
|
data->threadId.store(QThread::currentThreadId());
|
||||||
#else
|
#else
|
||||||
data->threadId = to_HANDLE(pthread_self());
|
data->threadId.store(to_HANDLE(pthread_self()));
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
if (!QCoreApplicationPrivate::theMainThread)
|
if (!QCoreApplicationPrivate::theMainThread)
|
||||||
QCoreApplicationPrivate::theMainThread = data->thread.load();
|
QCoreApplicationPrivate::theMainThread = data->thread.load();
|
||||||
@ -318,45 +313,43 @@ extern "C" {
|
|||||||
typedef void*(*QtThreadCallback)(void*);
|
typedef void*(*QtThreadCallback)(void*);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // QT_NO_THREAD
|
#endif // QT_CONFIG(thread)
|
||||||
|
|
||||||
void QThreadPrivate::createEventDispatcher(QThreadData *data)
|
QAbstractEventDispatcher *QThreadPrivate::createEventDispatcher(QThreadData *data)
|
||||||
{
|
{
|
||||||
#if defined(Q_OS_OSX)
|
Q_UNUSED(data);
|
||||||
|
#if defined(Q_OS_DARWIN)
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
int value = qEnvironmentVariableIntValue("QT_EVENT_DISPATCHER_CORE_FOUNDATION", &ok);
|
int value = qEnvironmentVariableIntValue("QT_EVENT_DISPATCHER_CORE_FOUNDATION", &ok);
|
||||||
if (ok && value > 0)
|
if (ok && value > 0)
|
||||||
data->eventDispatcher.storeRelease(new QEventDispatcherCoreFoundation);
|
return new QEventDispatcherCoreFoundation;
|
||||||
else
|
else
|
||||||
data->eventDispatcher.storeRelease(new QEventDispatcherUNIX);
|
return new QEventDispatcherUNIX;
|
||||||
#elif !defined(QT_NO_GLIB)
|
#elif !defined(QT_NO_GLIB)
|
||||||
|
const bool isQtMainThread = data->thread == QCoreApplicationPrivate::mainThread();
|
||||||
if (qEnvironmentVariableIsEmpty("QT_NO_GLIB")
|
if (qEnvironmentVariableIsEmpty("QT_NO_GLIB")
|
||||||
&& qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB")
|
&& (isQtMainThread || qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB"))
|
||||||
&& QEventDispatcherGlib::versionSupported())
|
&& QEventDispatcherGlib::versionSupported())
|
||||||
data->eventDispatcher.storeRelease(new QEventDispatcherGlib);
|
return new QEventDispatcherGlib;
|
||||||
else
|
else
|
||||||
data->eventDispatcher.storeRelease(new QEventDispatcherUNIX);
|
return new QEventDispatcherUNIX;
|
||||||
#else
|
#else
|
||||||
data->eventDispatcher.storeRelease(new QEventDispatcherUNIX);
|
return new QEventDispatcherUNIX;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
data->eventDispatcher.load()->startingUp();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef QT_NO_THREAD
|
#if QT_CONFIG(thread)
|
||||||
|
|
||||||
#ifndef Q_OS_GENODE
|
#ifndef Q_OS_GENODE
|
||||||
#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
|
#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
|
||||||
static void setCurrentThreadName(pthread_t threadId, const char *name)
|
static void setCurrentThreadName(const char *name)
|
||||||
{
|
{
|
||||||
# if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
|
# if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
|
||||||
Q_UNUSED(threadId);
|
|
||||||
prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
|
prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
|
||||||
# elif defined(Q_OS_MAC)
|
# elif defined(Q_OS_MAC)
|
||||||
Q_UNUSED(threadId);
|
|
||||||
pthread_setname_np(name);
|
pthread_setname_np(name);
|
||||||
# elif defined(Q_OS_QNX)
|
# elif defined(Q_OS_QNX)
|
||||||
pthread_setname_np(threadId, name);
|
pthread_setname_np(pthread_self(), name);
|
||||||
# endif
|
# endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -371,6 +364,10 @@ void *QThreadPrivate::start(void *arg)
|
|||||||
pthread_cleanup_push(QThreadPrivate::finish, arg);
|
pthread_cleanup_push(QThreadPrivate::finish, arg);
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
|
|
||||||
|
#ifndef QT_NO_EXCEPTIONS
|
||||||
|
try
|
||||||
|
#endif
|
||||||
|
{
|
||||||
QThread *thr = reinterpret_cast<QThread *>(arg);
|
QThread *thr = reinterpret_cast<QThread *>(arg);
|
||||||
QThreadData *data = QThreadData::get2(thr);
|
QThreadData *data = QThreadData::get2(thr);
|
||||||
|
|
||||||
@ -387,7 +384,7 @@ void *QThreadPrivate::start(void *arg)
|
|||||||
thr->d_func()->setPriority(QThread::Priority(thr->d_func()->priority & ~ThreadPriorityResetFlag));
|
thr->d_func()->setPriority(QThread::Priority(thr->d_func()->priority & ~ThreadPriorityResetFlag));
|
||||||
}
|
}
|
||||||
|
|
||||||
data->threadId = to_HANDLE(pthread_self());
|
data->threadId.store(to_HANDLE(pthread_self()));
|
||||||
set_thread_data(data);
|
set_thread_data(data);
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
|
|
||||||
@ -395,10 +392,7 @@ void *QThreadPrivate::start(void *arg)
|
|||||||
data->quitNow = thr->d_func()->exited;
|
data->quitNow = thr->d_func()->exited;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data->eventDispatcher.load()) // custom event dispatcher set?
|
data->ensureEventDispatcher();
|
||||||
data->eventDispatcher.load()->startingUp();
|
|
||||||
else
|
|
||||||
createEventDispatcher(data);
|
|
||||||
|
|
||||||
#ifdef Q_OS_GENODE
|
#ifdef Q_OS_GENODE
|
||||||
QThread::setTerminationEnabled(true);
|
QThread::setTerminationEnabled(true);
|
||||||
@ -406,14 +400,13 @@ void *QThreadPrivate::start(void *arg)
|
|||||||
#else
|
#else
|
||||||
#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
|
#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
|
||||||
{
|
{
|
||||||
// sets the name of the current thread.
|
// Sets the name of the current thread. We can only do this
|
||||||
QString objectName = thr->objectName();
|
// when the thread is starting, as we don't have a cross
|
||||||
|
// platform way of setting the name of an arbitrary thread.
|
||||||
pthread_t thread_id = from_HANDLE<pthread_t>(data->threadId);
|
if (Q_LIKELY(thr->objectName().isEmpty()))
|
||||||
if (Q_LIKELY(objectName.isEmpty()))
|
setCurrentThreadName(thr->metaObject()->className());
|
||||||
setCurrentThreadName(thread_id, thr->metaObject()->className());
|
|
||||||
else
|
else
|
||||||
setCurrentThreadName(thread_id, objectName.toLocal8Bit());
|
setCurrentThreadName(thr->objectName().toLocal8Bit());
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -424,7 +417,24 @@ void *QThreadPrivate::start(void *arg)
|
|||||||
#endif
|
#endif
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
thr->run();
|
thr->run();
|
||||||
|
}
|
||||||
|
#ifndef QT_NO_EXCEPTIONS
|
||||||
|
#ifdef __GLIBCXX__
|
||||||
|
// POSIX thread cancellation under glibc is implemented by throwing an exception
|
||||||
|
// of this type. Do what libstdc++ is doing and handle it specially in order not to
|
||||||
|
// abort the application if user's code calls a cancellation function.
|
||||||
|
catch (const abi::__forced_unwind &) {
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
#endif // __GLIBCXX__
|
||||||
|
catch (...) {
|
||||||
|
qTerminate();
|
||||||
|
}
|
||||||
|
#endif // QT_NO_EXCEPTIONS
|
||||||
|
|
||||||
|
// This pop runs finish() below. It's outside the try/catch (and has its
|
||||||
|
// own try/catch) to prevent finish() to be run in case an exception is
|
||||||
|
// thrown.
|
||||||
#ifndef Q_OS_GENODE
|
#ifndef Q_OS_GENODE
|
||||||
pthread_cleanup_pop(1);
|
pthread_cleanup_pop(1);
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
@ -433,6 +443,10 @@ void *QThreadPrivate::start(void *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void QThreadPrivate::finish(void *arg)
|
void QThreadPrivate::finish(void *arg)
|
||||||
|
{
|
||||||
|
#ifndef QT_NO_EXCEPTIONS
|
||||||
|
try
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
QThread *thr = reinterpret_cast<QThread *>(arg);
|
QThread *thr = reinterpret_cast<QThread *>(arg);
|
||||||
QThreadPrivate *d = thr->d_func();
|
QThreadPrivate *d = thr->d_func();
|
||||||
@ -468,6 +482,20 @@ void QThreadPrivate::finish(void *arg)
|
|||||||
d->isInFinish = false;
|
d->isInFinish = false;
|
||||||
d->thread_done.wakeAll();
|
d->thread_done.wakeAll();
|
||||||
}
|
}
|
||||||
|
#ifndef QT_NO_EXCEPTIONS
|
||||||
|
#ifdef __GLIBCXX__
|
||||||
|
// POSIX thread cancellation under glibc is implemented by throwing an exception
|
||||||
|
// of this type. Do what libstdc++ is doing and handle it specially in order not to
|
||||||
|
// abort the application if user's code calls a cancellation function.
|
||||||
|
catch (const abi::__forced_unwind &) {
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
#endif // __GLIBCXX__
|
||||||
|
catch (...) {
|
||||||
|
qTerminate();
|
||||||
|
}
|
||||||
|
#endif // QT_NO_EXCEPTIONS
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -491,6 +519,11 @@ Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
|
|||||||
// LSB doesn't define _SC_NPROCESSORS_ONLN.
|
// LSB doesn't define _SC_NPROCESSORS_ONLN.
|
||||||
# define _SC_NPROCESSORS_ONLN 84
|
# define _SC_NPROCESSORS_ONLN 84
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef Q_OS_WASM
|
||||||
|
int QThreadPrivate::idealThreadCount = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
|
|
||||||
int QThread::idealThreadCount() Q_DECL_NOTHROW
|
int QThread::idealThreadCount() Q_DECL_NOTHROW
|
||||||
@ -514,9 +547,6 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW
|
|||||||
if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) {
|
if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) {
|
||||||
perror("sysctl");
|
perror("sysctl");
|
||||||
}
|
}
|
||||||
#elif defined(Q_OS_IRIX)
|
|
||||||
// IRIX
|
|
||||||
cores = (int)sysconf(_SC_NPROC_ONLN);
|
|
||||||
#elif defined(Q_OS_INTEGRITY)
|
#elif defined(Q_OS_INTEGRITY)
|
||||||
#if (__INTEGRITY_MAJOR_VERSION >= 10)
|
#if (__INTEGRITY_MAJOR_VERSION >= 10)
|
||||||
// Integrity V10+ does support multicore CPUs
|
// Integrity V10+ does support multicore CPUs
|
||||||
@ -544,6 +574,8 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW
|
|||||||
// as of aug 2008 VxWorks < 6.6 only supports one single core CPU
|
// as of aug 2008 VxWorks < 6.6 only supports one single core CPU
|
||||||
cores = 1;
|
cores = 1;
|
||||||
# endif
|
# endif
|
||||||
|
#elif defined(Q_OS_WASM)
|
||||||
|
cores = QThreadPrivate::idealThreadCount;
|
||||||
#elif defined(Q_OS_GENODE)
|
#elif defined(Q_OS_GENODE)
|
||||||
cores = 1;
|
cores = 1;
|
||||||
#else
|
#else
|
||||||
@ -562,6 +594,8 @@ void QThread::yieldCurrentThread()
|
|||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // QT_CONFIG(thread)
|
||||||
|
|
||||||
static timespec makeTimespec(time_t secs, long nsecs)
|
static timespec makeTimespec(time_t secs, long nsecs)
|
||||||
{
|
{
|
||||||
struct timespec ts;
|
struct timespec ts;
|
||||||
@ -585,8 +619,59 @@ void QThread::usleep(unsigned long usecs)
|
|||||||
qt_nanosleep(makeTimespec(usecs / 1000 / 1000, usecs % (1000*1000) * 1000));
|
qt_nanosleep(makeTimespec(usecs / 1000 / 1000, usecs % (1000*1000) * 1000));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if QT_CONFIG(thread)
|
||||||
|
|
||||||
#ifndef Q_OS_GENODE
|
#ifndef Q_OS_GENODE
|
||||||
#ifdef QT_HAS_THREAD_PRIORITY_SCHEDULING
|
#ifdef QT_HAS_THREAD_PRIORITY_SCHEDULING
|
||||||
|
#if defined(Q_OS_QNX)
|
||||||
|
static bool calculateUnixPriority(int priority, int *sched_policy, int *sched_priority)
|
||||||
|
{
|
||||||
|
// On QNX, NormalPriority is mapped to 10. A QNX system could use a value different
|
||||||
|
// than 10 for the "normal" priority but it's difficult to achieve this so we'll
|
||||||
|
// assume that no one has ever created such a system. This makes the mapping from
|
||||||
|
// Qt priorities to QNX priorities lopsided. There's usually more space available
|
||||||
|
// to map into above the "normal" priority than below it. QNX also has a privileged
|
||||||
|
// priority range (for threads that assist the kernel). We'll assume that no Qt
|
||||||
|
// thread needs to use priorities in that range.
|
||||||
|
int priority_norm = 10;
|
||||||
|
// _sched_info::priority_priv isn't documented. You'd think that it's the start of the
|
||||||
|
// privileged priority range but it's actually the end of the unpriviledged range.
|
||||||
|
struct _sched_info info;
|
||||||
|
if (SchedInfo_r(0, *sched_policy, &info) != EOK)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (priority == QThread::IdlePriority) {
|
||||||
|
*sched_priority = info.priority_min;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priority_norm < info.priority_min)
|
||||||
|
priority_norm = info.priority_min;
|
||||||
|
if (priority_norm > info.priority_priv)
|
||||||
|
priority_norm = info.priority_priv;
|
||||||
|
|
||||||
|
int to_min, to_max;
|
||||||
|
int from_min, from_max;
|
||||||
|
int prio;
|
||||||
|
if (priority < QThread::NormalPriority) {
|
||||||
|
to_min = info.priority_min;
|
||||||
|
to_max = priority_norm;
|
||||||
|
from_min = QThread::LowestPriority;
|
||||||
|
from_max = QThread::NormalPriority;
|
||||||
|
} else {
|
||||||
|
to_min = priority_norm;
|
||||||
|
to_max = info.priority_priv;
|
||||||
|
from_min = QThread::NormalPriority;
|
||||||
|
from_max = QThread::TimeCriticalPriority;
|
||||||
|
}
|
||||||
|
|
||||||
|
prio = ((priority - from_min) * (to_max - to_min)) / (from_max - from_min) + to_min;
|
||||||
|
prio = qBound(to_min, prio, to_max);
|
||||||
|
|
||||||
|
*sched_priority = prio;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
#else
|
||||||
// Does some magic and calculate the Unix scheduler priorities
|
// Does some magic and calculate the Unix scheduler priorities
|
||||||
// sched_policy is IN/OUT: it must be set to a valid policy before calling this function
|
// sched_policy is IN/OUT: it must be set to a valid policy before calling this function
|
||||||
// sched_priority is OUT only
|
// sched_priority is OUT only
|
||||||
@ -630,6 +715,7 @@ static bool calculateUnixPriority(int priority, int *sched_policy, int *sched_pr
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
|
|
||||||
void QThread::start(Priority priority)
|
void QThread::start(Priority priority)
|
||||||
@ -766,6 +852,12 @@ void QThread::start(Priority priority)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef Q_OS_INTEGRITY
|
||||||
|
if (Q_LIKELY(objectName().isEmpty()))
|
||||||
|
pthread_attr_setthreadname(&attr, metaObject()->className());
|
||||||
|
else
|
||||||
|
pthread_attr_setthreadname(&attr, objectName().toLocal8Bit());
|
||||||
|
#endif
|
||||||
pthread_t threadId;
|
pthread_t threadId;
|
||||||
int code = pthread_create(&threadId, &attr, QThreadPrivate::start, this);
|
int code = pthread_create(&threadId, &attr, QThreadPrivate::start, this);
|
||||||
if (code == EPERM) {
|
if (code == EPERM) {
|
||||||
@ -776,7 +868,7 @@ void QThread::start(Priority priority)
|
|||||||
#endif
|
#endif
|
||||||
code = pthread_create(&threadId, &attr, QThreadPrivate::start, this);
|
code = pthread_create(&threadId, &attr, QThreadPrivate::start, this);
|
||||||
}
|
}
|
||||||
d->data->threadId = to_HANDLE(threadId);
|
d->data->threadId.store(to_HANDLE(threadId));
|
||||||
|
|
||||||
pthread_attr_destroy(&attr);
|
pthread_attr_destroy(&attr);
|
||||||
|
|
||||||
@ -785,7 +877,7 @@ void QThread::start(Priority priority)
|
|||||||
|
|
||||||
d->running = false;
|
d->running = false;
|
||||||
d->finished = false;
|
d->finished = false;
|
||||||
d->data->threadId = 0;
|
d->data->threadId.store(nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
@ -810,10 +902,10 @@ void QThread::terminate()
|
|||||||
d->running = false;
|
d->running = false;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
if (!d->data->threadId)
|
if (!d->data->threadId.load())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId));
|
int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId.load()));
|
||||||
if (code) {
|
if (code) {
|
||||||
qWarning("QThread::start: Thread termination error: %s",
|
qWarning("QThread::start: Thread termination error: %s",
|
||||||
qPrintable(qt_error_string((code))));
|
qPrintable(qt_error_string((code))));
|
||||||
@ -841,7 +933,7 @@ bool QThread::wait(unsigned long time)
|
|||||||
#ifdef Q_OS_GENODE
|
#ifdef Q_OS_GENODE
|
||||||
if (d->thread_id == QThread::currentThreadId()) {
|
if (d->thread_id == QThread::currentThreadId()) {
|
||||||
#else
|
#else
|
||||||
if (from_HANDLE<pthread_t>(d->data->threadId) == pthread_self()) {
|
if (from_HANDLE<pthread_t>(d->data->threadId.load()) == pthread_self()) {
|
||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
qWarning("QThread::wait: Thread tried to wait on itself");
|
qWarning("QThread::wait: Thread tried to wait on itself");
|
||||||
return false;
|
return false;
|
||||||
@ -902,7 +994,7 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority)
|
|||||||
int sched_policy;
|
int sched_policy;
|
||||||
sched_param param;
|
sched_param param;
|
||||||
|
|
||||||
if (pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId), &sched_policy, ¶m) != 0) {
|
if (pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.load()), &sched_policy, ¶m) != 0) {
|
||||||
// failed to get the scheduling policy, don't bother setting
|
// failed to get the scheduling policy, don't bother setting
|
||||||
// the priority
|
// the priority
|
||||||
qWarning("QThread::setPriority: Cannot get scheduler parameters");
|
qWarning("QThread::setPriority: Cannot get scheduler parameters");
|
||||||
@ -918,15 +1010,15 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority)
|
|||||||
}
|
}
|
||||||
|
|
||||||
param.sched_priority = prio;
|
param.sched_priority = prio;
|
||||||
int status = pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId), sched_policy, ¶m);
|
int status = pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.load()), sched_policy, ¶m);
|
||||||
|
|
||||||
# ifdef SCHED_IDLE
|
# ifdef SCHED_IDLE
|
||||||
// were we trying to set to idle priority and failed?
|
// were we trying to set to idle priority and failed?
|
||||||
if (status == -1 && sched_policy == SCHED_IDLE && errno == EINVAL) {
|
if (status == -1 && sched_policy == SCHED_IDLE && errno == EINVAL) {
|
||||||
// reset to lowest priority possible
|
// reset to lowest priority possible
|
||||||
pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId), &sched_policy, ¶m);
|
pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.load()), &sched_policy, ¶m);
|
||||||
param.sched_priority = sched_get_priority_min(sched_policy);
|
param.sched_priority = sched_get_priority_min(sched_policy);
|
||||||
pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId), sched_policy, ¶m);
|
pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.load()), sched_policy, ¶m);
|
||||||
}
|
}
|
||||||
# else
|
# else
|
||||||
Q_UNUSED(status);
|
Q_UNUSED(status);
|
||||||
@ -936,7 +1028,7 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority)
|
|||||||
#endif /* Q_OS_GENODE */
|
#endif /* Q_OS_GENODE */
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // QT_NO_THREAD
|
#endif // QT_CONFIG(thread)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include "qnitpickerscreen.h"
|
#include "qnitpickerscreen.h"
|
||||||
#include "qnitpickerwindowsurface.h"
|
#include "qnitpickerwindowsurface.h"
|
||||||
#include "QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h"
|
#include "QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h"
|
||||||
#include "QtFontDatabaseSupport/private/qbasicfontdatabase_p.h"
|
#include "QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ QAbstractEventDispatcher *QNitpickerIntegration::createEventDispatcher() const
|
|||||||
|
|
||||||
void QNitpickerIntegration::initialize()
|
void QNitpickerIntegration::initialize()
|
||||||
{
|
{
|
||||||
screenAdded(_nitpicker_screen);
|
QWindowSystemInterface::handleScreenAdded(_nitpicker_screen);
|
||||||
|
|
||||||
QString icStr = QPlatformInputContextFactory::requested();
|
QString icStr = QPlatformInputContextFactory::requested();
|
||||||
if (icStr.isNull())
|
if (icStr.isNull())
|
||||||
@ -87,7 +87,7 @@ void QNitpickerIntegration::initialize()
|
|||||||
|
|
||||||
QPlatformFontDatabase *QNitpickerIntegration::fontDatabase() const
|
QPlatformFontDatabase *QNitpickerIntegration::fontDatabase() const
|
||||||
{
|
{
|
||||||
static QBasicFontDatabase db;
|
static QFreeTypeFontDatabase db;
|
||||||
return &db;
|
return &db;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
class QNitpickerIntegrationPlugin : public QPlatformIntegrationPlugin
|
class QNitpickerIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.3" FILE "nitpicker.json")
|
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "nitpicker.json")
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static Genode::Env *_env;
|
static Genode::Env *_env;
|
||||||
|
@ -490,27 +490,6 @@ QNitpickerPlatformWindow::~QNitpickerPlatformWindow()
|
|||||||
_nitpicker_session_label_list.removeOne(_nitpicker_session_label);
|
_nitpicker_session_label_list.removeOne(_nitpicker_session_label);
|
||||||
}
|
}
|
||||||
|
|
||||||
QWindow *QNitpickerPlatformWindow::window() const
|
|
||||||
{
|
|
||||||
if (qnpw_verbose)
|
|
||||||
qDebug() << "QNitpickerPlatformWindow::window()";
|
|
||||||
return QPlatformWindow::window();
|
|
||||||
}
|
|
||||||
|
|
||||||
QPlatformWindow *QNitpickerPlatformWindow::parent() const
|
|
||||||
{
|
|
||||||
if (qnpw_verbose)
|
|
||||||
qDebug() << "QNitpickerPlatformWindow::parent()";
|
|
||||||
return QPlatformWindow::parent();
|
|
||||||
}
|
|
||||||
|
|
||||||
QPlatformScreen *QNitpickerPlatformWindow::screen() const
|
|
||||||
{
|
|
||||||
if (qnpw_verbose)
|
|
||||||
qDebug() << "QNitpickerPlatformWindow::screen()";
|
|
||||||
return QPlatformWindow::screen();
|
|
||||||
}
|
|
||||||
|
|
||||||
QSurfaceFormat QNitpickerPlatformWindow::format() const
|
QSurfaceFormat QNitpickerPlatformWindow::format() const
|
||||||
{
|
{
|
||||||
if (qnpw_verbose)
|
if (qnpw_verbose)
|
||||||
@ -588,7 +567,7 @@ void QNitpickerPlatformWindow::setWindowFlags(Qt::WindowFlags flags)
|
|||||||
qDebug() << "QNitpickerPlatformWindow::setWindowFlags() finished";
|
qDebug() << "QNitpickerPlatformWindow::setWindowFlags() finished";
|
||||||
}
|
}
|
||||||
|
|
||||||
void QNitpickerPlatformWindow::setWindowState(Qt::WindowState state)
|
void QNitpickerPlatformWindow::setWindowState(Qt::WindowStates state)
|
||||||
{
|
{
|
||||||
if (qnpw_verbose)
|
if (qnpw_verbose)
|
||||||
qDebug() << "QNitpickerPlatformWindow::setWindowState(" << state << ")";
|
qDebug() << "QNitpickerPlatformWindow::setWindowState(" << state << ")";
|
||||||
@ -680,11 +659,11 @@ bool QNitpickerPlatformWindow::isActive() const
|
|||||||
return QPlatformWindow::isActive();
|
return QPlatformWindow::isActive();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool QNitpickerPlatformWindow::isEmbedded(const QPlatformWindow *parentWindow) const
|
bool QNitpickerPlatformWindow::isEmbedded() const
|
||||||
{
|
{
|
||||||
if (qnpw_verbose)
|
if (qnpw_verbose)
|
||||||
qDebug() << "QNitpickerPlatformWindow::isEmbedded()";
|
qDebug() << "QNitpickerPlatformWindow::isEmbedded()";
|
||||||
return QPlatformWindow::isEmbedded(parentWindow);
|
return QPlatformWindow::isEmbedded();
|
||||||
}
|
}
|
||||||
|
|
||||||
QPoint QNitpickerPlatformWindow::mapToGlobal(const QPoint &pos) const
|
QPoint QNitpickerPlatformWindow::mapToGlobal(const QPoint &pos) const
|
||||||
@ -764,11 +743,11 @@ bool QNitpickerPlatformWindow::setWindowModified(bool modified)
|
|||||||
return QPlatformWindow::setWindowModified(modified);
|
return QPlatformWindow::setWindowModified(modified);
|
||||||
}
|
}
|
||||||
|
|
||||||
void QNitpickerPlatformWindow::windowEvent(QEvent *event)
|
bool QNitpickerPlatformWindow::windowEvent(QEvent *event)
|
||||||
{
|
{
|
||||||
if (qnpw_verbose)
|
if (qnpw_verbose)
|
||||||
qDebug() << "QNitpickerPlatformWindow::windowEvent(" << event->type() << ")";
|
qDebug() << "QNitpickerPlatformWindow::windowEvent(" << event->type() << ")";
|
||||||
QPlatformWindow::windowEvent(event);
|
return QPlatformWindow::windowEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool QNitpickerPlatformWindow::startSystemResize(const QPoint &pos, Qt::Corner corner)
|
bool QNitpickerPlatformWindow::startSystemResize(const QPoint &pos, Qt::Corner corner)
|
||||||
|
@ -555,13 +555,4 @@ qtwebkit/Source/WebCore/svg/SVGVKernElement.idl
|
|||||||
qtwebkit/Source/WebCore/svg/SVGViewSpec.idl
|
qtwebkit/Source/WebCore/svg/SVGViewSpec.idl
|
||||||
qtwebkit/Source/WebCore/svg/SVGZoomAndPan.idl
|
qtwebkit/Source/WebCore/svg/SVGZoomAndPan.idl
|
||||||
qtwebkit/Source/WebCore/svg/SVGZoomEvent.idl
|
qtwebkit/Source/WebCore/svg/SVGZoomEvent.idl
|
||||||
qtwebkit/Source/WebCore/html/track/AudioTrack.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/AudioTrackList.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/TextTrack.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/TextTrackCue.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/TextTrackCueList.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/TextTrackList.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/TrackEvent.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/VideoTrack.idl
|
|
||||||
qtwebkit/Source/WebCore/html/track/VideoTrackList.idl
|
|
||||||
generated/InternalSettingsGenerated.idl
|
generated/InternalSettingsGenerated.idl
|
||||||
|
@ -19,8 +19,8 @@ function extract_incpath()
|
|||||||
|
|
||||||
echo -e "QT_INCPATH += \\" > incpath.inc
|
echo -e "QT_INCPATH += \\" > incpath.inc
|
||||||
|
|
||||||
sed -e '/\/qt-everywhere-opensource-src.*\//!d' \
|
sed -e '/\/qt-everywhere-src.*\//!d' \
|
||||||
-e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \
|
-e 's/.*\/qt-everywhere-src-[^\/]*\// /' \
|
||||||
-e 's/linux-g++/genode-g++/' \
|
-e 's/linux-g++/genode-g++/' \
|
||||||
incpath.inc.tmp >> incpath.inc
|
incpath.inc.tmp >> incpath.inc
|
||||||
|
|
||||||
@ -61,8 +61,8 @@ function extract_vpath()
|
|||||||
|
|
||||||
echo -e "QT_VPATH += \\" > vpath.inc
|
echo -e "QT_VPATH += \\" > vpath.inc
|
||||||
|
|
||||||
sed -e '/\/qt-everywhere-opensource-src.*\//!d' \
|
sed -e '/\/qt-everywhere-src.*\//!d' \
|
||||||
-e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \
|
-e 's/.*\/qt-everywhere-src-[^\/]*\// /' \
|
||||||
-e 's/\/[^\/]* [\\]*$/ \\/' \
|
-e 's/\/[^\/]* [\\]*$/ \\/' \
|
||||||
vpath.inc.tmp | sort -u >> vpath.inc
|
vpath.inc.tmp | sort -u >> vpath.inc
|
||||||
|
|
||||||
|
@ -1,19 +1,21 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
QT_VERSION=5.8.0
|
QT_VERSION=5.13.0
|
||||||
|
|
||||||
./genode_qt5_configure
|
./genode_qt5_configure
|
||||||
|
|
||||||
make -j8
|
make -j32
|
||||||
|
|
||||||
# qtbase
|
# qtbase
|
||||||
|
|
||||||
|
cd qtbase/src/3rdparty/pcre2 && ../../../../create_generated_inc qt5_pcre2 && cp qt5_pcre2_generated.inc ../../../.. && cd ../../../..
|
||||||
cd qtbase/src/corelib && ../../../create_generated_inc qt5_core && cp qt5_core_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/corelib && ../../../create_generated_inc qt5_core && cp qt5_core_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/gui && ../../../create_generated_inc qt5_gui && cp qt5_gui_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/gui && ../../../create_generated_inc qt5_gui && cp qt5_gui_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/network && ../../../create_generated_inc qt5_network && cp qt5_network_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/network && ../../../create_generated_inc qt5_network && cp qt5_network_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/opengl && ../../../create_generated_inc qt5_opengl && cp qt5_opengl_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/opengl && ../../../create_generated_inc qt5_opengl && cp qt5_opengl_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/printsupport && ../../../create_generated_inc qt5_printsupport && cp qt5_printsupport_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/printsupport && ../../../create_generated_inc qt5_printsupport && cp qt5_printsupport_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/sql && ../../../create_generated_inc qt5_sql && cp qt5_sql_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/sql && ../../../create_generated_inc qt5_sql && cp qt5_sql_generated.inc ../../.. && cd ../../..
|
||||||
|
cd qtbase/src/testlib && ../../../create_generated_inc qt5_test && cp qt5_test_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/widgets && ../../../create_generated_inc qt5_widgets && cp qt5_widgets_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/widgets && ../../../create_generated_inc qt5_widgets && cp qt5_widgets_generated.inc ../../.. && cd ../../..
|
||||||
cd qtbase/src/xml && ../../../create_generated_inc qt5_xml && cp qt5_xml_generated.inc ../../.. && cd ../../..
|
cd qtbase/src/xml && ../../../create_generated_inc qt5_xml && cp qt5_xml_generated.inc ../../.. && cd ../../..
|
||||||
|
|
||||||
@ -22,28 +24,34 @@ cd qttools/src/designer/src/uitools && ../../../../../create_generated_
|
|||||||
cd qtdeclarative/src/qml && ../../../create_generated_inc qt5_qml && cp qt5_qml_generated.inc ../../.. && cd ../../..
|
cd qtdeclarative/src/qml && ../../../create_generated_inc qt5_qml && cp qt5_qml_generated.inc ../../.. && cd ../../..
|
||||||
cd qtdeclarative/src/quick && ../../../create_generated_inc qt5_quick && cp qt5_quick_generated.inc ../../.. && cd ../../..
|
cd qtdeclarative/src/quick && ../../../create_generated_inc qt5_quick && cp qt5_quick_generated.inc ../../.. && cd ../../..
|
||||||
cd qtdeclarative/src/imports/qtquick2 && ../../../../create_generated_inc qt5_qtquick2plugin && cp qt5_qtquick2plugin_generated.inc ../../../.. && cd ../../../..
|
cd qtdeclarative/src/imports/qtquick2 && ../../../../create_generated_inc qt5_qtquick2plugin && cp qt5_qtquick2plugin_generated.inc ../../../.. && cd ../../../..
|
||||||
|
cd qtdeclarative/src/imports/folderlistmodel && ../../../../create_generated_inc qt5_qmlfolderlistmodelplugin && cp qt5_qmlfolderlistmodelplugin_generated.inc ../../../.. && cd ../../../..
|
||||||
|
cd qtdeclarative/src/imports/layouts && ../../../../create_generated_inc qt5_qquicklayoutsplugin && cp qt5_qquicklayoutsplugin_generated.inc ../../../.. && cd ../../../..
|
||||||
|
cd qtdeclarative/src/imports/window && ../../../../create_generated_inc qt5_windowplugin && cp qt5_windowplugin_generated.inc ../../../.. && cd ../../../..
|
||||||
|
|
||||||
|
|
||||||
cd qtsvg/src/svg && ../../../create_generated_inc qt5_svg && cp qt5_svg_generated.inc ../../.. && cd ../../..
|
cd qtsvg/src/svg && ../../../create_generated_inc qt5_svg && cp qt5_svg_generated.inc ../../.. && cd ../../..
|
||||||
|
|
||||||
cd qtvirtualkeyboard/src/virtualkeyboard && ../../../create_generated_inc qt5_qtvirtualkeyboardplugin && cp qt5_qtvirtualkeyboardplugin_generated.inc ../../.. && cd ../../..
|
cd qtvirtualkeyboard/src/virtualkeyboard && ../../../create_generated_inc qt5_virtualkeyboard && cp qt5_virtualkeyboard_generated.inc ../../.. && cd ../../..
|
||||||
|
cd qtvirtualkeyboard/src/plugin && ../../../create_generated_inc qt5_qtvirtualkeyboardplugin && cp qt5_qtvirtualkeyboardplugin_generated.inc ../../.. && cd ../../..
|
||||||
|
cd qtvirtualkeyboard/src/styles && ../../../create_generated_inc qt5_qtvirtualkeyboardstylesplugin && cp qt5_qtvirtualkeyboardstylesplugin_generated.inc ../../.. && cd ../../..
|
||||||
|
|
||||||
# qtwebkit
|
# qtwebkit
|
||||||
|
|
||||||
make -C qtwebkit/Source/JavaScriptCore -f Makefile.JavaScriptCore sub-DerivedSources-pri > JavaScriptCore.log
|
make -C qtwebkit/Source/JavaScriptCore -f Makefile.JavaScriptCore sub-DerivedSources-pri > JavaScriptCore.log
|
||||||
cd qtwebkit/Source/JavaScriptCore
|
cd qtwebkit/Source/JavaScriptCore
|
||||||
../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/JavaScriptCore/Target.pri -o Makefile
|
../../../qtbase/bin/qmake ../../../../qt-everywhere-src-${QT_VERSION}/qtwebkit/Source/JavaScriptCore/Target.pri -o Makefile
|
||||||
../../../create_generated_inc qt5_jscore && cp qt5_jscore_generated.inc ../../.. && cd ../../..
|
../../../create_generated_inc qt5_jscore && cp qt5_jscore_generated.inc ../../.. && cd ../../..
|
||||||
cd qtwebkit/Source/WTF
|
cd qtwebkit/Source/WTF
|
||||||
ln -sf Makefile.WTF Makefile && ../../../create_generated_inc qt5_wtf && cp qt5_wtf_generated.inc ../../.. && cd ../../..
|
ln -sf Makefile.WTF Makefile && ../../../create_generated_inc qt5_wtf && cp qt5_wtf_generated.inc ../../.. && cd ../../..
|
||||||
|
|
||||||
make -C qtwebkit/Source/ThirdParty/ANGLE -f Makefile.ANGLE sub-DerivedSources-pri > ANGLE.log
|
make -C qtwebkit/Source/ThirdParty/ANGLE -f Makefile.ANGLE sub-DerivedSources-pri > ANGLE.log
|
||||||
cd qtwebkit/Source/ThirdParty/ANGLE
|
cd qtwebkit/Source/ThirdParty/ANGLE
|
||||||
../../../../qtbase/bin/qmake ../../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/ThirdParty/ANGLE/Target.pri -o Makefile
|
../../../../qtbase/bin/qmake ../../../../../qt-everywhere-src-${QT_VERSION}/qtwebkit/Source/ThirdParty/ANGLE/Target.pri -o Makefile
|
||||||
../../../../create_generated_inc qt5_angle && cp qt5_angle_generated.inc ../../../.. && cd ../../../..
|
../../../../create_generated_inc qt5_angle && cp qt5_angle_generated.inc ../../../.. && cd ../../../..
|
||||||
|
|
||||||
make -C qtwebkit/Source/WebCore -f Makefile.WebCore sub-DerivedSources-pri > WebCore.log
|
make -C qtwebkit/Source/WebCore -f Makefile.WebCore sub-DerivedSources-pri > WebCore.log
|
||||||
cd qtwebkit/Source/WebCore
|
cd qtwebkit/Source/WebCore
|
||||||
../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/WebCore/Target.pri -o Makefile
|
../../../qtbase/bin/qmake ../../../../qt-everywhere-src-${QT_VERSION}/qtwebkit/Source/WebCore/Target.pri -o Makefile
|
||||||
../../../create_generated_inc qt5_webcore && cp qt5_webcore_generated.inc ../../.. && cd ../../..
|
../../../create_generated_inc qt5_webcore && cp qt5_webcore_generated.inc ../../.. && cd ../../..
|
||||||
cd qtwebkit/Source/WebKit
|
cd qtwebkit/Source/WebKit
|
||||||
ln -sf Makefile.WebKit1 Makefile && ../../../create_generated_inc qt5_webkit && cp qt5_webkit_generated.inc ../../.. && cd ../../..
|
ln -sf Makefile.WebKit1 Makefile && ../../../create_generated_inc qt5_webkit && cp qt5_webkit_generated.inc ../../.. && cd ../../..
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
# QtGui
|
# QtGui
|
||||||
# QtSql
|
# QtSql
|
||||||
|
|
||||||
../qt-everywhere-opensource-src-5.8.0/configure \
|
../qt-everywhere-src-5.13.0/configure \
|
||||||
-opensource \
|
-opensource \
|
||||||
-confirm-license \
|
-confirm-license \
|
||||||
-no-separate-debug-info \
|
-no-separate-debug-info \
|
||||||
@ -35,6 +35,12 @@
|
|||||||
-no-icu \
|
-no-icu \
|
||||||
-qt-pcre \
|
-qt-pcre \
|
||||||
-system-zlib \
|
-system-zlib \
|
||||||
|
-no-feature-alloca \
|
||||||
|
-no-feature-alloca_h \
|
||||||
|
-no-feature-cxx11_future \
|
||||||
|
-no-feature-futimens \
|
||||||
|
-no-feature-futimes \
|
||||||
|
-no-feature-getauxval \
|
||||||
-no-feature-poll_ppoll \
|
-no-feature-poll_ppoll \
|
||||||
-no-feature-process \
|
-no-feature-process \
|
||||||
-no-feature-sharedmemory \
|
-no-feature-sharedmemory \
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user