diff options
38 files changed, 223 insertions, 239 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index ff22a13aee08..837066807f89 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.6 -QT5_VERSION?= 5.3.2 +QT5_VERSION?= 5.4.1 QT_PREFIX?= ${LOCALBASE} diff --git a/devel/dbus-qt5/pkg-plist b/devel/dbus-qt5/pkg-plist index 26aae1547ef9..5c531f3421c2 100644 --- a/devel/dbus-qt5/pkg-plist +++ b/devel/dbus-qt5/pkg-plist @@ -1,3 +1,4 @@ +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/dbus_minimal_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbus_symbols_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractadaptor_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractinterface_p.h diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile index be24b9c148cd..589b96adc425 100644 --- a/devel/qmake5/Makefile +++ b/devel/qmake5/Makefile @@ -9,6 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator USE_QT5= # empty +USES= pkgconfig QT_DIST= base REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes @@ -17,9 +18,11 @@ CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \ -no-iconv -no-icu -no-dbus -no-xcb -no-opengl \ -no-glib -no-audio-backend -no-fontconfig \ -no-gtkstyle -no-xinput2 -no-xrender \ - -no-xkbcommon + -no-evdev -no-xkbcommon -no-alsa \ + -no-freetype -no-gif -no-harfbuzz -no-libjpeg \ + -no-libpng -no-pulseaudio -no-widgets # Features yet to be removed from qconfig.pri. -TBR_CONFIG= alsa|concurrent|.*freetype|.*gif|.*gui|.*harfbuzz|inotify|.*jpeg|.*pkg-config|.*png|pulseaudio|.*widgets|xlib +TBR_CONFIG= concurrent|inotify|xlib QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER} INSTALL_TARGET= install_qmake install_mkspecs diff --git a/devel/qmake5/files/patch-mkspecs__common__freebsd.conf b/devel/qmake5/files/patch-mkspecs__common__freebsd.conf index ebc4e3b7f931..9313b84608b0 100644 --- a/devel/qmake5/files/patch-mkspecs__common__freebsd.conf +++ b/devel/qmake5/files/patch-mkspecs__common__freebsd.conf @@ -1,6 +1,6 @@ --- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 +++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 -@@ -0,0 +1,30 @@ +@@ -0,0 +1,32 @@ +# +# qmake configuration for FreeBSD +# @@ -12,10 +12,12 @@ + +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + ++QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined +QMAKE_LFLAGS_THREAD = -pthread + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = ++QMAKE_LIBS_EXECINFO = -lexecinfo +QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_OPENGL = -lGL +QMAKE_LIBS_THREAD = diff --git a/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf b/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf index ce325ed178e3..c6c041299eb6 100644 --- a/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf +++ b/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf @@ -1,6 +1,6 @@ --- mkspecs/freebsd-g++/qmake.conf.orig +++ mkspecs/freebsd-g++/qmake.conf -@@ -2,31 +2,7 @@ +@@ -2,32 +2,7 @@ # qmake configuration for freebsd-g++ # @@ -19,6 +19,7 @@ - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = +-QMAKE_LIBS_EXECINFO = -lexecinfo -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_THREAD = diff --git a/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf b/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf index 4b4eb71234ed..c2b082c06cfc 100644 --- a/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf +++ b/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf @@ -1,6 +1,6 @@ --- mkspecs/unsupported/freebsd-clang/qmake.conf +++ mkspecs/unsupported/freebsd-clang/qmake.conf -@@ -2,31 +2,6 @@ +@@ -2,32 +2,6 @@ # qmake configuration for freebsd-clang # @@ -15,10 +15,12 @@ -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib - +-QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -QMAKE_LFLAGS_THREAD = -pthread - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = +-QMAKE_LIBS_EXECINFO = -lexecinfo -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_THREAD = @@ -30,7 +32,6 @@ - -include(../../common/unix.conf) -include(../../common/gcc-base-unix.conf) --include(../../common/g++-unix.conf) -include(../../common/clang.conf) +include(../../common/freebsd.conf) +include(../../common/gcc-base-unix.conf) diff --git a/devel/qmake5/pkg-plist b/devel/qmake5/pkg-plist index 01d1efdb03a3..875d4efd7b6e 100644 --- a/devel/qmake5/pkg-plist +++ b/devel/qmake5/pkg-plist @@ -48,6 +48,7 @@ %%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx.conf %%QT_MKSPECDIR%%/common/qcc-base.conf +%%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h %%QT_MKSPECDIR%%/common/shell-unix.conf %%QT_MKSPECDIR%%/common/shell-win32.conf %%QT_MKSPECDIR%%/common/unix.conf @@ -99,8 +100,6 @@ %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qeglfshooks_imx6.cpp %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/linux-maemo-n9-g++/qmake.conf -%%QT_MKSPECDIR%%/devices/linux-maemo-n9-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h @@ -119,6 +118,7 @@ %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf %%QT_MKSPECDIR%%/features/build_pass.prf %%QT_MKSPECDIR%%/features/c++11.prf +%%QT_MKSPECDIR%%/features/c++14.prf %%QT_MKSPECDIR%%/features/cmake_functions.prf %%QT_MKSPECDIR%%/features/configure.prf %%QT_MKSPECDIR%%/features/create_cmake.prf @@ -150,6 +150,8 @@ %%QT_MKSPECDIR%%/features/java.prf %%QT_MKSPECDIR%%/features/lex.prf %%QT_MKSPECDIR%%/features/link_pkgconfig.prf +%%QT_MKSPECDIR%%/features/link_ltcg.prf +%%QT_MKSPECDIR%%/features/ltcg.prf %%QT_MKSPECDIR%%/features/mac/default_post.prf %%QT_MKSPECDIR%%/features/mac/default_pre.prf %%QT_MKSPECDIR%%/features/mac/objective_c.prf @@ -222,7 +224,6 @@ %%QT_MKSPECDIR%%/features/win32/default_pre.prf %%QT_MKSPECDIR%%/features/win32/dumpcpp.prf %%QT_MKSPECDIR%%/features/win32/idcidl.prf -%%QT_MKSPECDIR%%/features/win32/ltcg.prf %%QT_MKSPECDIR%%/features/win32/msvc_mp.prf %%QT_MKSPECDIR%%/features/win32/opengl.prf %%QT_MKSPECDIR%%/features/win32/openvg.prf @@ -282,8 +283,6 @@ %%QT_MKSPECDIR%%/linux-g++-32/qplatformdefs.h %%QT_MKSPECDIR%%/linux-g++-64/qmake.conf %%QT_MKSPECDIR%%/linux-g++-64/qplatformdefs.h -%%QT_MKSPECDIR%%/linux-g++-maemo/qmake.conf -%%QT_MKSPECDIR%%/linux-g++-maemo/qplatformdefs.h %%QT_MKSPECDIR%%/linux-g++/qmake.conf %%QT_MKSPECDIR%%/linux-g++/qplatformdefs.h %%QT_MKSPECDIR%%/linux-icc-32/qmake.conf @@ -333,11 +332,13 @@ %%QT_MKSPECDIR%%/macx-ios-clang/Default-568h@2x.png %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib +%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib %%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_config.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_parts.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/sdk.prf %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh @@ -394,8 +395,6 @@ %%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/linux-libc++-clang/qmake.conf -%%QT_MKSPECDIR%%/unsupported/linux-libc++-clang/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/nacl-g++/qmake.conf diff --git a/devel/qt5-assistant/files/patch-src__src.pro b/devel/qt5-assistant/files/patch-src__src.pro index 08d7b209cf61..db5a512547ec 100644 --- a/devel/qt5-assistant/files/patch-src__src.pro +++ b/devel/qt5-assistant/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 9dcd959bfad5..6724b9a8a497 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -12,6 +11,7 @@ COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:${PORTSDIR}/devel/icu \ libpcre.so:${PORTSDIR}/devel/pcre +USES= execinfo USE_GNOME= glib20 USE_QT5= qmake_build buildtools_build QT_DIST= base @@ -22,13 +22,10 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-xcb -no-opengl \ - -no-feature-glib -no-feature-alsa \ - -no-feature-concurrent -no-feature-evdev \ - -no-fontconfig -no-freetype \ - -no-gtkstyle -no-feature-inotify -no-feature-libudev \ - -no-feature-pulseaudio -no-feature-xcb -no-xinput \ - -no-xkb -no-xrender -no-xshape -no-xsync -no-xvideo \ - -no-xkbcommon -no-harfbuzz + -no-alsa -no-egl -no-evdev -no-feature-concurrent \ + -no-fontconfig -no-freetype -no-gtkstyle -no-harfbuzz \ + -no-libudev -no-pulseaudio -no-xcb -no-xinput -no-xkb \ + -no-xkbcommon -no-xrender -no-xshape -no-xsync -no-xvideo USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib @@ -40,8 +37,6 @@ QT_CONFIG= glib icu .include <bsd.port.pre.mk> post-install: - ${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \ - ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private # Allow qconfig.h to be customized by single ports. ${REINPLACE_CMD} -i "" '1 s|.*|#include <QtCore/qconfig-modules.h>|' \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h diff --git a/devel/qt5-core/files/patch-git_7ca54ce5 b/devel/qt5-core/files/patch-git_7ca54ce5 deleted file mode 100644 index c476aa7f3749..000000000000 --- a/devel/qt5-core/files/patch-git_7ca54ce5 +++ /dev/null @@ -1,43 +0,0 @@ -commit 7ca54ce5d964646a141acac82f468476f2d66c35 -Author: Kai Koehne <kai.koehne@digia.com> -Date: Wed Oct 1 13:22:02 2014 +0200 - - Avoid naming clashes with QStringLiteral local variable - - MSVC 2013 complains about the use of 's' if a variable 's' is already - defined in the context: - - error C2373: 's' : redefinition; different type modifiers - error C3493: 's' cannot be implicitly captured because no default capture - mode has been specified - - This looks like a compiler bug. Anyhow, it's easy to avoid the clash in - most cases by using a more distinctive name ... - - Task-number: QTBUG-41706 - Change-Id: Iaff1b6d37897fa8cf9e4913effa0498f9fd7bb07 - Reviewed-by: hjk <hjk121@nokiamail.com> - Reviewed-by: Olivier Goffart <ogoffart@woboq.com> - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - ---- src/corelib/tools/qstring.h -+++ src/corelib/tools/qstring.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -167,8 +167,8 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2, - Q_STATIC_STRING_DATA_HEADER_INITIALIZER(Size), \ - QT_UNICODE_LITERAL(str) }; \ - QStringDataPtr holder = { qstring_literal.data_ptr() }; \ -- const QString s(holder); \ -- return s; \ -+ const QString qstring_literal_temp(holder); \ -+ return qstring_literal_temp; \ - }()) \ - /**/ - diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index 1fb990624982..ca1df08535ce 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -1,24 +1,4 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/cp949codetbl_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-buffer-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-buffer.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-dump.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-external.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-gdef-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-gdef.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-global.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-gpos-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-gpos.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-gsub-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-gsub.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-impl.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-open-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-open.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-shape.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-shaper-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-shaper.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-stream-private.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz-stream.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/harfbuzz.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractanimation_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracteventdispatcher_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractfileengine_p.h @@ -75,6 +55,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiconvcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qicucodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiodevice_p.h @@ -94,7 +75,6 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_tools_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlockfile_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingcategory_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingregistry_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmachparser_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_moc_p.h @@ -139,6 +119,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsjiscodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstatemachine_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h @@ -163,6 +144,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qversionnumber_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h @@ -197,6 +179,8 @@ %%QT_INCDIR%%/QtCore/QByteArray %%QT_INCDIR%%/QtCore/QByteArrayData %%QT_INCDIR%%/QtCore/QByteArrayDataPtr +%%QT_INCDIR%%/QtCore/QByteArrayList +%%QT_INCDIR%%/QtCore/QByteArrayListIterator %%QT_INCDIR%%/QtCore/QByteArrayMatcher %%QT_INCDIR%%/QtCore/QByteRef %%QT_INCDIR%%/QtCore/QCache @@ -223,6 +207,7 @@ %%QT_INCDIR%%/QtCore/QDynamicPropertyChangeEvent %%QT_INCDIR%%/QtCore/QEasingCurve %%QT_INCDIR%%/QtCore/QElapsedTimer +%%QT_INCDIR%%/QtCore/QEnableSharedFromThis %%QT_INCDIR%%/QtCore/QEvent %%QT_INCDIR%%/QtCore/QEventLoop %%QT_INCDIR%%/QtCore/QEventLoopLocker @@ -253,7 +238,6 @@ %%QT_INCDIR%%/QtCore/QGlobalStatic %%QT_INCDIR%%/QtCore/QHash %%QT_INCDIR%%/QtCore/QHashData -%%QT_INCDIR%%/QtCore/QHashDummyNode %%QT_INCDIR%%/QtCore/QHashDummyValue %%QT_INCDIR%%/QtCore/QHashIterator %%QT_INCDIR%%/QtCore/QHashNode @@ -271,7 +255,9 @@ %%QT_INCDIR%%/QtCore/QJsonObject %%QT_INCDIR%%/QtCore/QJsonParseError %%QT_INCDIR%%/QtCore/QJsonValue +%%QT_INCDIR%%/QtCore/QJsonValuePtr %%QT_INCDIR%%/QtCore/QJsonValueRef +%%QT_INCDIR%%/QtCore/QJsonValueRefPtr %%QT_INCDIR%%/QtCore/QLatin1Char %%QT_INCDIR%%/QtCore/QLatin1Literal %%QT_INCDIR%%/QtCore/QLatin1String @@ -286,6 +272,7 @@ %%QT_INCDIR%%/QtCore/QList %%QT_INCDIR%%/QtCore/QListData %%QT_INCDIR%%/QtCore/QListIterator +%%QT_INCDIR%%/QtCore/QListSpecialMethods %%QT_INCDIR%%/QtCore/QLocale %%QT_INCDIR%%/QtCore/QLockFile %%QT_INCDIR%%/QtCore/QLoggingCategory @@ -316,6 +303,7 @@ %%QT_INCDIR%%/QtCore/QModelIndexList %%QT_INCDIR%%/QtCore/QMultiHash %%QT_INCDIR%%/QtCore/QMultiMap +%%QT_INCDIR%%/QtCore/QMutableByteArrayListIterator %%QT_INCDIR%%/QtCore/QMutableFutureIterator %%QT_INCDIR%%/QtCore/QMutableHashIterator %%QT_INCDIR%%/QtCore/QMutableLinkedListIterator @@ -390,6 +378,7 @@ %%QT_INCDIR%%/QtCore/QStaticByteArrayData %%QT_INCDIR%%/QtCore/QStaticPlugin %%QT_INCDIR%%/QtCore/QStaticStringData +%%QT_INCDIR%%/QtCore/QStorageInfo %%QT_INCDIR%%/QtCore/QString %%QT_INCDIR%%/QtCore/QStringBuilder %%QT_INCDIR%%/QtCore/QStringData @@ -500,6 +489,7 @@ %%QT_INCDIR%%/QtCore/qbitarray.h %%QT_INCDIR%%/QtCore/qbuffer.h %%QT_INCDIR%%/QtCore/qbytearray.h +%%QT_INCDIR%%/QtCore/qbytearraylist.h %%QT_INCDIR%%/QtCore/qbytearraymatcher.h %%QT_INCDIR%%/QtCore/qcache.h %%QT_INCDIR%%/QtCore/qchar.h @@ -627,6 +617,7 @@ %%QT_INCDIR%%/QtCore/qstandardpaths.h %%QT_INCDIR%%/QtCore/qstate.h %%QT_INCDIR%%/QtCore/qstatemachine.h +%%QT_INCDIR%%/QtCore/qstorageinfo.h %%QT_INCDIR%%/QtCore/qstring.h %%QT_INCDIR%%/QtCore/qstringbuilder.h %%QT_INCDIR%%/QtCore/qstringlist.h diff --git a/devel/qt5-designer/files/patch-src__src.pro b/devel/qt5-designer/files/patch-src__src.pro index 7a6ae6e6b21a..9c21c99b3e22 100644 --- a/devel/qt5-designer/files/patch-src__src.pro +++ b/devel/qt5-designer/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/devel/qt5-help/files/patch-src__src.pro b/devel/qt5-help/files/patch-src__src.pro index 08d7b209cf61..db5a512547ec 100644 --- a/devel/qt5-help/files/patch-src__src.pro +++ b/devel/qt5-help/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/devel/qt5-linguist/files/patch-src__src.pro b/devel/qt5-linguist/files/patch-src__src.pro index 9eb0f97e1d6c..6d56b5176d96 100644 --- a/devel/qt5-linguist/files/patch-src__src.pro +++ b/devel/qt5-linguist/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/devel/qt5-qdbusviewer/files/patch-src__src.pro b/devel/qt5-qdbusviewer/files/patch-src__src.pro index 597dab0d6d97..806df233f94d 100644 --- a/devel/qt5-qdbusviewer/files/patch-src__src.pro +++ b/devel/qt5-qdbusviewer/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist index 64663ff81559..96b8909365f7 100644 --- a/devel/qt5-testlib/pkg-plist +++ b/devel/qt5-testlib/pkg-plist @@ -11,6 +11,7 @@ %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h diff --git a/devel/qt5-uitools/files/patch-src__src.pro b/devel/qt5-uitools/files/patch-src__src.pro index 7a6ae6e6b21a..9c21c99b3e22 100644 --- a/devel/qt5-uitools/files/patch-src__src.pro +++ b/devel/qt5-uitools/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index 7acebc48ec71..df67ef14c523 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index fe4bf968495b..76815b9a8674 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,34 +1,34 @@ -SHA256 (KDE/Qt/5.3.2/qtbase-opensource-src-5.3.2.tar.xz) = 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 -SIZE (KDE/Qt/5.3.2/qtbase-opensource-src-5.3.2.tar.xz) = 46694044 -SHA256 (KDE/Qt/5.3.2/qtdeclarative-opensource-src-5.3.2.tar.xz) = 04108193b9642c0394c157e98b5c1d81f555f9f495289e07ebfb6f03448b2382 -SIZE (KDE/Qt/5.3.2/qtdeclarative-opensource-src-5.3.2.tar.xz) = 18171760 -SHA256 (KDE/Qt/5.3.2/qtdoc-opensource-src-5.3.2.tar.xz) = 0b3453efb634d1111ad7bc963f5839fe52106b08b8afce5d0b516b88a46e509d -SIZE (KDE/Qt/5.3.2/qtdoc-opensource-src-5.3.2.tar.xz) = 16650824 -SHA256 (KDE/Qt/5.3.2/qtgraphicaleffects-opensource-src-5.3.2.tar.xz) = 688f2658a13d2919487d3f5acacb037364ee5c8fe0319f524a7d0a4987ba7ffc -SIZE (KDE/Qt/5.3.2/qtgraphicaleffects-opensource-src-5.3.2.tar.xz) = 14326148 -SHA256 (KDE/Qt/5.3.2/qtimageformats-opensource-src-5.3.2.tar.xz) = d303cbceb73774edc0cfdbde6b97b0e41077e242ff6520710890f81bea40e2d4 -SIZE (KDE/Qt/5.3.2/qtimageformats-opensource-src-5.3.2.tar.xz) = 2098004 -SHA256 (KDE/Qt/5.3.2/qtmultimedia-opensource-src-5.3.2.tar.xz) = 255fac66c93f33743c707da3d41d95c7c562924fe4eb829cbb7b21b2274a0e0b -SIZE (KDE/Qt/5.3.2/qtmultimedia-opensource-src-5.3.2.tar.xz) = 3190116 -SHA256 (KDE/Qt/5.3.2/qtquick1-opensource-src-5.3.2.tar.xz) = 9b7b2e895180e4e3e1ed4e7b5ad049b7d021a05c96be6edc5fc433c6de6273fb -SIZE (KDE/Qt/5.3.2/qtquick1-opensource-src-5.3.2.tar.xz) = 15989460 -SHA256 (KDE/Qt/5.3.2/qtquickcontrols-opensource-src-5.3.2.tar.xz) = 5f890f014d087141b0aaa8954b21b1f85740233b60a556e0e9624227bff6d94e -SIZE (KDE/Qt/5.3.2/qtquickcontrols-opensource-src-5.3.2.tar.xz) = 857000 -SHA256 (KDE/Qt/5.3.2/qtscript-opensource-src-5.3.2.tar.xz) = 6e18002c8c993402c7d28b3c0705092e41c18769b6d3ff741e9a3b3ce9d6d7be -SIZE (KDE/Qt/5.3.2/qtscript-opensource-src-5.3.2.tar.xz) = 2585704 -SHA256 (KDE/Qt/5.3.2/qtserialport-opensource-src-5.3.2.tar.xz) = a886e0cb08be60e57958676dc91c6f649468184a03c89c2aeabc904d36fd5a4b -SIZE (KDE/Qt/5.3.2/qtserialport-opensource-src-5.3.2.tar.xz) = 256448 -SHA256 (KDE/Qt/5.3.2/qtsvg-opensource-src-5.3.2.tar.xz) = 1ec5c2f307ee55740cc8c82dc2ca4037dbc0ca398b4e32abbd967535e71ae30f -SIZE (KDE/Qt/5.3.2/qtsvg-opensource-src-5.3.2.tar.xz) = 1763380 -SHA256 (KDE/Qt/5.3.2/qttools-opensource-src-5.3.2.tar.xz) = 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e -SIZE (KDE/Qt/5.3.2/qttools-opensource-src-5.3.2.tar.xz) = 8993140 -SHA256 (KDE/Qt/5.3.2/qttranslations-opensource-src-5.3.2.tar.xz) = 29b648f005e9e588714c8e3c2115db65c7a944a6ba84baafb84091d73213c5cd -SIZE (KDE/Qt/5.3.2/qttranslations-opensource-src-5.3.2.tar.xz) = 1047568 -SHA256 (KDE/Qt/5.3.2/qtwebkit-opensource-src-5.3.2.tar.xz) = e47122ed15e8e1cc32e11b3cd89bacc056437215134a204899f2fddb4fd92e5b -SIZE (KDE/Qt/5.3.2/qtwebkit-opensource-src-5.3.2.tar.xz) = 33445540 -SHA256 (KDE/Qt/5.3.2/qtwebkit-examples-opensource-src-5.3.2.tar.xz) = c8081a0863b7d8e2e39ec0e2fe288331ddab093a682959ba7378392512296482 -SIZE (KDE/Qt/5.3.2/qtwebkit-examples-opensource-src-5.3.2.tar.xz) = 3409140 -SHA256 (KDE/Qt/5.3.2/qtx11extras-opensource-src-5.3.2.tar.xz) = ca6a28c95be0bf18080b4a20ae9e2c24a77a45aaf557f06047e65b1280c17251 -SIZE (KDE/Qt/5.3.2/qtx11extras-opensource-src-5.3.2.tar.xz) = 30032 -SHA256 (KDE/Qt/5.3.2/qtxmlpatterns-opensource-src-5.3.2.tar.xz) = acab0307039e117475caf2c95e425ead09ab5ee08ce15205fb3c0af7d7ec1abb -SIZE (KDE/Qt/5.3.2/qtxmlpatterns-opensource-src-5.3.2.tar.xz) = 1314016 +SHA256 (KDE/Qt/5.4.1/qtbase-opensource-src-5.4.1.tar.xz) = 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 +SIZE (KDE/Qt/5.4.1/qtbase-opensource-src-5.4.1.tar.xz) = 46132220 +SHA256 (KDE/Qt/5.4.1/qtdeclarative-opensource-src-5.4.1.tar.xz) = 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 +SIZE (KDE/Qt/5.4.1/qtdeclarative-opensource-src-5.4.1.tar.xz) = 18406948 +SHA256 (KDE/Qt/5.4.1/qtdoc-opensource-src-5.4.1.tar.xz) = 18b1229234aaba204870cea7c06b99d4c6b9a1f689a1a204c010bfee3b15cfa9 +SIZE (KDE/Qt/5.4.1/qtdoc-opensource-src-5.4.1.tar.xz) = 16050812 +SHA256 (KDE/Qt/5.4.1/qtgraphicaleffects-opensource-src-5.4.1.tar.xz) = bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c +SIZE (KDE/Qt/5.4.1/qtgraphicaleffects-opensource-src-5.4.1.tar.xz) = 14323700 +SHA256 (KDE/Qt/5.4.1/qtimageformats-opensource-src-5.4.1.tar.xz) = 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f +SIZE (KDE/Qt/5.4.1/qtimageformats-opensource-src-5.4.1.tar.xz) = 2108976 +SHA256 (KDE/Qt/5.4.1/qtmultimedia-opensource-src-5.4.1.tar.xz) = 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e +SIZE (KDE/Qt/5.4.1/qtmultimedia-opensource-src-5.4.1.tar.xz) = 3184784 +SHA256 (KDE/Qt/5.4.1/qtquick1-opensource-src-5.4.1.tar.xz) = eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d +SIZE (KDE/Qt/5.4.1/qtquick1-opensource-src-5.4.1.tar.xz) = 15983524 +SHA256 (KDE/Qt/5.4.1/qtquickcontrols-opensource-src-5.4.1.tar.xz) = fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 +SIZE (KDE/Qt/5.4.1/qtquickcontrols-opensource-src-5.4.1.tar.xz) = 945324 +SHA256 (KDE/Qt/5.4.1/qtscript-opensource-src-5.4.1.tar.xz) = f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf +SIZE (KDE/Qt/5.4.1/qtscript-opensource-src-5.4.1.tar.xz) = 2581684 +SHA256 (KDE/Qt/5.4.1/qtserialport-opensource-src-5.4.1.tar.xz) = 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff +SIZE (KDE/Qt/5.4.1/qtserialport-opensource-src-5.4.1.tar.xz) = 255120 +SHA256 (KDE/Qt/5.4.1/qtsvg-opensource-src-5.4.1.tar.xz) = be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c +SIZE (KDE/Qt/5.4.1/qtsvg-opensource-src-5.4.1.tar.xz) = 1758812 +SHA256 (KDE/Qt/5.4.1/qttools-opensource-src-5.4.1.tar.xz) = 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 +SIZE (KDE/Qt/5.4.1/qttools-opensource-src-5.4.1.tar.xz) = 9262024 +SHA256 (KDE/Qt/5.4.1/qttranslations-opensource-src-5.4.1.tar.xz) = 3c4d045f974bc9ee76bb85d319737cf182b8697c4ba72d2c075d3609cfaf9041 +SIZE (KDE/Qt/5.4.1/qttranslations-opensource-src-5.4.1.tar.xz) = 1071784 +SHA256 (KDE/Qt/5.4.1/qtwebkit-opensource-src-5.4.1.tar.xz) = 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf +SIZE (KDE/Qt/5.4.1/qtwebkit-opensource-src-5.4.1.tar.xz) = 33457544 +SHA256 (KDE/Qt/5.4.1/qtwebkit-examples-opensource-src-5.4.1.tar.xz) = 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a +SIZE (KDE/Qt/5.4.1/qtwebkit-examples-opensource-src-5.4.1.tar.xz) = 3419316 +SHA256 (KDE/Qt/5.4.1/qtx11extras-opensource-src-5.4.1.tar.xz) = 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e +SIZE (KDE/Qt/5.4.1/qtx11extras-opensource-src-5.4.1.tar.xz) = 25460 +SHA256 (KDE/Qt/5.4.1/qtxmlpatterns-opensource-src-5.4.1.tar.xz) = f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 +SIZE (KDE/Qt/5.4.1/qtxmlpatterns-opensource-src-5.4.1.tar.xz) = 1307228 diff --git a/devel/qt5/files/extrapatch-configure b/devel/qt5/files/extrapatch-configure index 820a0a76a559..2c02359b83cb 100644 --- a/devel/qt5/files/extrapatch-configure +++ b/devel/qt5/files/extrapatch-configure @@ -18,7 +18,7 @@ --- configure +++ configure -@@ -4073,7 +4073,7 @@ +@@ -3683,7 +3683,7 @@ setBootstrapVariable() } # build qmake @@ -27,7 +27,7 @@ echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit -@@ -4481,8 +4481,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do +@@ -4542,8 +4542,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do SQLITE_AUTODETECT_FAILED="no" if [ "$CFG_SQLITE" = "system" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then @@ -38,9 +38,9 @@ else QT_CFLAGS_SQLITE= QT_LFLAGS_SQLITE="-lsqlite3 -lz" -@@ -4582,8 +4582,8 @@ fi +@@ -4643,8 +4643,8 @@ fi # auto-detect libdbus-1 support - if [ "$CFG_DBUS" != "no" ]; then + if [ "$CFG_DBUS" = "linked" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then - QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` - QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` @@ -49,7 +49,7 @@ else QT_LIBS_DBUS="-ldbus-1" fi -@@ -4615,8 +4615,8 @@ fi +@@ -4672,8 +4672,8 @@ fi # auto-detect Glib support if [ "$CFG_GLIB" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -60,7 +60,7 @@ fi if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then CFG_GLIB=yes -@@ -4638,9 +4638,9 @@ fi +@@ -4696,9 +4696,9 @@ fi # auto-detect GTK style support if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -73,7 +73,7 @@ fi if [ -n "$QT_CFLAGS_QGTK2" ] ; then CFG_QGTKSTYLE=yes -@@ -4686,8 +4686,8 @@ fi +@@ -4745,8 +4745,8 @@ fi # Auto-detect PulseAudio support if [ "$CFG_PULSEAUDIO" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -84,9 +84,9 @@ fi if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then CFG_PULSEAUDIO=yes -@@ -4810,10 +4810,10 @@ if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then +@@ -4870,10 +4870,10 @@ if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then elif [ "$CFG_OPENGL" = "es2" ]; then - #OpenGL ES 2.x + #OpenGL ES 2.0 if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then - QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` - QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'` @@ -94,12 +94,12 @@ - QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null` + QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` + QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | filterLibraryOptions | sed -e 's,^-L,,g' -e 's, -L, ,g'` -+ QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null | filterIncludeOptions` -+ QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null | filterLibraryOptions` ++ QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null | filterLibraryOptions` ++ QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null | filterIncludeOptions` QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`" QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBDIR_OPENGL_ES2"`" QMakeVar set QMAKE_LIBS_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBS_OPENGL_ES2"`" -@@ -4842,8 +4842,8 @@ fi +@@ -4918,8 +4918,8 @@ fi # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then @@ -110,18 +110,20 @@ else QT_CFLAGS_FONTCONFIG= QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" -@@ -4869,8 +4869,8 @@ ORIG_CFG_KMS="$CFG_KMS" +@@ -4945,9 +4945,9 @@ ORIG_CFG_KMS="$CFG_KMS" if [ "$CFG_LIBUDEV" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then - QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` - QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null` +- QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null` + QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` + QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null | filterLibraryOptions` ++ QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null | filterIncludeOptions` QMakeVar set QMAKE_INCDIR_LIBUDEV "$QMAKE_INCDIR_LIBUDEV" QMakeVar set QMAKE_LIBS_LIBUDEV "$QMAKE_LIBS_LIBUDEV" fi -@@ -4958,8 +4958,8 @@ fi +@@ -5036,8 +5036,8 @@ fi if [ "$CFG_XCB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then @@ -132,7 +134,7 @@ fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" -@@ -4978,16 +4978,16 @@ if [ "$CFG_XCB" != "no" ]; then +@@ -5056,16 +5056,16 @@ if [ "$CFG_XCB" != "no" ]; then CFG_XCB="system" if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" @@ -148,12 +150,12 @@ if $PKG_CONFIG --exists "xcb-xkb >= 1.10" 2>/dev/null; then - QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`" - QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`" -+ QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null | filterIncludeOptions`" -+ QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null | filterLibraryOptions`" ++ QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null` | filterIncludeOptions" ++ QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null` | filterLibraryOptions" if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then CFG_XKB=yes fi -@@ -5040,8 +5040,8 @@ fi +@@ -5119,8 +5119,8 @@ fi if [ "$CFG_DIRECTFB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then @@ -164,9 +166,9 @@ if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then CFG_DIRECTFB=yes elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then -@@ -5093,8 +5093,8 @@ ORIG_CFG_XKBCOMMON="$CFG_XKBCOMMON" - if [ "$CFG_XCB" != "no" ]; then - if [ "$CFG_XKBCOMMON" = "auto" ] || [ "$CFG_XKBCOMMON" = "system" ]; then +@@ -5173,8 +5173,8 @@ if [ "$CFG_XCB" != "no" ]; then + if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then + # Check if there is a suitable system-wide xkbcommon if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then - QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`" - QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`" @@ -175,7 +177,7 @@ QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" -@@ -5139,9 +5139,9 @@ if [ "$CFG_EGL" != "no" ]; then +@@ -5227,9 +5227,9 @@ if [ "$CFG_EGL" != "no" ]; then fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then diff --git a/graphics/qt5-pixeltool/files/patch-src__src.pro b/graphics/qt5-pixeltool/files/patch-src__src.pro index 5419f8421292..966cb3496f48 100644 --- a/graphics/qt5-pixeltool/files/patch-src__src.pro +++ b/graphics/qt5-pixeltool/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/graphics/qt5-svg/pkg-plist b/graphics/qt5-svg/pkg-plist index 1c8344701e0c..35db0182079f 100644 --- a/graphics/qt5-svg/pkg-plist +++ b/graphics/qt5-svg/pkg-plist @@ -6,6 +6,7 @@ %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstructure_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstyle_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgtinydocument_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h %%QT_INCDIR%%/QtSvg/QGraphicsSvgItem %%QT_INCDIR%%/QtSvg/QSvgGenerator %%QT_INCDIR%%/QtSvg/QSvgRenderer diff --git a/lang/qt5-qml/Makefile b/lang/qt5-qml/Makefile index 1b178ddfaab5..f9f495c44958 100644 --- a/lang/qt5-qml/Makefile +++ b/lang/qt5-qml/Makefile @@ -2,7 +2,6 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- diff --git a/lang/qt5-qml/files/patch-git_b84f08c8 b/lang/qt5-qml/files/patch-git_b84f08c8 deleted file mode 100644 index 1a632b140f27..000000000000 --- a/lang/qt5-qml/files/patch-git_b84f08c8 +++ /dev/null @@ -1,23 +0,0 @@ -Fixes the build with base GCC. - -commit b84f08c8b7c91a979bd74840561af2391ef20666 -Author: Lars Knoll <lars.knoll@digia.com> -Date: Tue May 6 13:30:31 2014 +0200 - - Fix compiler warning - - Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2 - Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> - ---- src/qml/jsruntime/qv4object_p.h -+++ src/qml/jsruntime/qv4object_p.h -@@ -168,7 +168,8 @@ struct Q_QML_EXPORT Object: Managed { - void defineReadonlyProperty(const StringRef name, ValueRef value); - - void insertMember(const StringRef s, const ValueRef v, PropertyAttributes attributes = Attr_Data) { -- insertMember(s, Property(*v), attributes); -+ Property p(*v); -+ insertMember(s, p, attributes); - } - void insertMember(const StringRef s, const Property &p, PropertyAttributes attributes); - diff --git a/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp b/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp deleted file mode 100644 index ecc5d0572282..000000000000 --- a/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/qml/jit/qv4assembler.cpp -+++ src/qml/jit/qv4assembler.cpp -@@ -96,7 +96,7 @@ QV4::ExecutableAllocator::ChunkOfPages *CompilationUnit::chunkForFunction(int fu - /* Platform/Calling convention/Architecture specific section */ - - #if CPU(X86_64) --# if OS(LINUX) || OS(MAC_OS_X) -+# if OS(UNIX) - static const Assembler::RegisterID calleeSavedRegisters[] = { - JSC::X86Registers::ebx, - JSC::X86Registers::r12, // LocalsRegister diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist index 7d51e93f4513..5c2660163aa5 100644 --- a/lang/qt5-qml/pkg-plist +++ b/lang/qt5-qml/pkg-plist @@ -178,6 +178,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regalloc_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexp_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexpobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4registerinfo_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtime_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4scopedvalue_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4script_p.h @@ -188,6 +189,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4ssa_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4targetplatform_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4unop_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_inl_p.h diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist index d01bcac73339..66c867b841d9 100644 --- a/multimedia/qt5-multimedia/pkg-plist +++ b/multimedia/qt5-multimedia/pkg-plist @@ -27,6 +27,7 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaobject_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaopenglhelper_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplaylist_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplaylistcontrol_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplaylistioplugin_p.h @@ -68,6 +69,7 @@ %%QT_INCDIR%%/QtMultimedia/QAudioInputSelectorControl %%QT_INCDIR%%/QtMultimedia/QAudioOutput %%QT_INCDIR%%/QtMultimedia/QAudioOutputSelectorControl +%%QT_INCDIR%%/QtMultimedia/QAbstractPlanarVideoBuffer %%QT_INCDIR%%/QtMultimedia/QAudioProbe %%QT_INCDIR%%/QtMultimedia/QAudioRecorder %%QT_INCDIR%%/QtMultimedia/QAudioSystemFactoryInterface diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist index 8e50603fa517..ed9cd8c9fc3b 100644 --- a/net/qt5-network/pkg-plist +++ b/net/qt5-network/pkg-plist @@ -2,6 +2,7 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractprotocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocketengine_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qasn1element_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qauthenticator_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qbearerengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qbearerplugin_p.h @@ -50,15 +51,17 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qspdyprotocolhandler_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificateextension_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcipher_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslconfiguration_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_openssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qurlinfo_p.h %%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache diff --git a/textproc/clucene-qt5/files/patch-src__src.pro b/textproc/clucene-qt5/files/patch-src__src.pro index 08d7b209cf61..db5a512547ec 100644 --- a/textproc/clucene-qt5/files/patch-src__src.pro +++ b/textproc/clucene-qt5/files/patch-src__src.pro @@ -34,7 +34,7 @@ missing dependencies. -qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner qtd3dservice +-winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - -qtNomakeTools( \ diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile index c34010ac318a..804a63396ec8 100644 --- a/www/webkit-qt5/Makefile +++ b/www/webkit-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/webkit-qt5/pkg-plist b/www/webkit-qt5/pkg-plist index 6fab2f02a1e4..3ad3300a55dc 100644 --- a/www/webkit-qt5/pkg-plist +++ b/www/webkit-qt5/pkg-plist @@ -10,6 +10,7 @@ %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qrawwebview_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qrawwebview_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qtwebsecurityorigin_p.h +%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebchannelwebkittransport_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdatabase_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdownloaditem_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdownloaditem_p_p.h diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index 61b0f87973d3..67ee719685fd 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,6 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- @@ -12,6 +11,7 @@ COMMENT= Qt graphical user interface module LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ + libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libxcb.so:${PORTSDIR}/x11/libxcb \ @@ -29,7 +29,8 @@ QT_DIST= base USE_XORG= x11 xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ - -no-evdev + -no-evdev \ + -system-harfbuzz USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist index 78e79e2471e5..26c257fb9e44 100644 --- a/x11-toolkits/qt5-gui/pkg-plist +++ b/x11-toolkits/qt5-gui/pkg-plist @@ -25,7 +25,7 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfont_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_ft_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_qpa_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_qpf2_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengineglyphcache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontsubset_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfragmentmap_p.h @@ -58,6 +58,7 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglextensions_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglframebufferobject_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglgradientcache_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglpaintdevice_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglpaintengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglqueryhelper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglshadercache_meego_p.h @@ -68,9 +69,11 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltextureglyphcache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltexturehelper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglversionfunctionsfactory_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglvertexarrayobject_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qoutlinemapper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpagedpaintdevice_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintbuffer_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintdevicewindow_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_blitter_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_pic_p.h @@ -145,7 +148,6 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformpixmap.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformscreen.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformscreen_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformscreenpageflipper.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformservices.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformsessionmanager.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformsharedgraphicscache.h @@ -300,10 +302,12 @@ %%QT_INCDIR%%/QtGui/QOpenGLVersionFunctions %%QT_INCDIR%%/QtGui/QOpenGLVersionProfile %%QT_INCDIR%%/QtGui/QOpenGLVertexArrayObject +%%QT_INCDIR%%/QtGui/QOpenGLWindow %%QT_INCDIR%%/QtGui/QPageLayout %%QT_INCDIR%%/QtGui/QPageSize %%QT_INCDIR%%/QtGui/QPagedPaintDevice %%QT_INCDIR%%/QtGui/QPaintDevice +%%QT_INCDIR%%/QtGui/QPaintDeviceWindow %%QT_INCDIR%%/QtGui/QPaintEngine %%QT_INCDIR%%/QtGui/QPaintEngineState %%QT_INCDIR%%/QtGui/QPaintEvent @@ -316,12 +320,14 @@ %%QT_INCDIR%%/QtGui/QPicture %%QT_INCDIR%%/QtGui/QPictureFormatPlugin %%QT_INCDIR%%/QtGui/QPictureIO +%%QT_INCDIR%%/QtGui/QPixelFormat %%QT_INCDIR%%/QtGui/QPixmap %%QT_INCDIR%%/QtGui/QPixmapCache %%QT_INCDIR%%/QtGui/QPolygon %%QT_INCDIR%%/QtGui/QPolygonF %%QT_INCDIR%%/QtGui/QQuaternion %%QT_INCDIR%%/QtGui/QRadialGradient +%%QT_INCDIR%%/QtGui/QRasterWindow %%QT_INCDIR%%/QtGui/QRawFont %%QT_INCDIR%%/QtGui/QRegExpValidator %%QT_INCDIR%%/QtGui/QRegion @@ -467,10 +473,12 @@ %%QT_INCDIR%%/QtGui/qopengltimerquery.h %%QT_INCDIR%%/QtGui/qopenglversionfunctions.h %%QT_INCDIR%%/QtGui/qopenglvertexarrayobject.h +%%QT_INCDIR%%/QtGui/qopenglwindow.h %%QT_INCDIR%%/QtGui/qpagedpaintdevice.h %%QT_INCDIR%%/QtGui/qpagelayout.h %%QT_INCDIR%%/QtGui/qpagesize.h %%QT_INCDIR%%/QtGui/qpaintdevice.h +%%QT_INCDIR%%/QtGui/qpaintdevicewindow.h %%QT_INCDIR%%/QtGui/qpaintengine.h %%QT_INCDIR%%/QtGui/qpainter.h %%QT_INCDIR%%/QtGui/qpainterpath.h @@ -479,10 +487,12 @@ %%QT_INCDIR%%/QtGui/qpen.h %%QT_INCDIR%%/QtGui/qpicture.h %%QT_INCDIR%%/QtGui/qpictureformatplugin.h +%%QT_INCDIR%%/QtGui/qpixelformat.h %%QT_INCDIR%%/QtGui/qpixmap.h %%QT_INCDIR%%/QtGui/qpixmapcache.h %%QT_INCDIR%%/QtGui/qpolygon.h %%QT_INCDIR%%/QtGui/qquaternion.h +%%QT_INCDIR%%/QtGui/qrasterwindow.h %%QT_INCDIR%%/QtGui/qrawfont.h %%QT_INCDIR%%/QtGui/qregion.h %%QT_INCDIR%%/QtGui/qrgb.h @@ -521,10 +531,14 @@ %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/cglconvenience_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/constant_mappings_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/dbusconnection_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qaccessiblebridgeutils_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_dummy_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_static_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_udev_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglcompositor_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h diff --git a/x11-toolkits/qt5-quick/files/patch-git_b84f08c8 b/x11-toolkits/qt5-quick/files/patch-git_b84f08c8 deleted file mode 100644 index 1a632b140f27..000000000000 --- a/x11-toolkits/qt5-quick/files/patch-git_b84f08c8 +++ /dev/null @@ -1,23 +0,0 @@ -Fixes the build with base GCC. - -commit b84f08c8b7c91a979bd74840561af2391ef20666 -Author: Lars Knoll <lars.knoll@digia.com> -Date: Tue May 6 13:30:31 2014 +0200 - - Fix compiler warning - - Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2 - Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> - ---- src/qml/jsruntime/qv4object_p.h -+++ src/qml/jsruntime/qv4object_p.h -@@ -168,7 +168,8 @@ struct Q_QML_EXPORT Object: Managed { - void defineReadonlyProperty(const StringRef name, ValueRef value); - - void insertMember(const StringRef s, const ValueRef v, PropertyAttributes attributes = Attr_Data) { -- insertMember(s, Property(*v), attributes); -+ Property p(*v); -+ insertMember(s, p, attributes); - } - void insertMember(const StringRef s, const Property &p, PropertyAttributes attributes); - diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist index 2e332d9d42a3..841bf9576199 100644 --- a/x11-toolkits/qt5-quick/pkg-plist +++ b/x11-toolkits/qt5-quick/pkg-plist @@ -1,5 +1,9 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/designerwindowmanager_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmlaccessible_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessibleattached_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessiblefactory_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanimatedimage_p.h @@ -32,6 +36,7 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickflipable_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfocusscope_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontloader_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontmetrics_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgridview_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickimage_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickimage_p_p.h @@ -53,6 +58,7 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmousearea_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmousearea_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmultipointtoucharea_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickopenglinfo_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpainteditem_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpath_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpath_p_p.h @@ -99,6 +105,7 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextedit_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinput_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinput_p_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextmetrics_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextnode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextnodeengine_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextutil_p.h @@ -110,7 +117,9 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindow_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowattached_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowmodule_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgabstractrenderer_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgadaptationlayer_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgareaallocator_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgatlastexture_p.h @@ -121,21 +130,23 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultimagenode_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultlayer_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultpainternode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultrectanglenode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdepthstencilbuffer_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldutil_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgengine_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsggeometry_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgmaterialshader_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnodeupdater_p.h -%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgpainternode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderer_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderloop_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrendernode_p.h -%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshareddistancefieldglyphcache_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshadersourcebuilder_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshareddistancefieldglyphcache_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexture_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturematerial_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgthreadedrenderloop_p.h @@ -145,15 +156,19 @@ %%QT_INCDIR%%/QtQuick/QQuickFramebufferObject %%QT_INCDIR%%/QtQuick/QQuickImageProvider %%QT_INCDIR%%/QtQuick/QQuickItem +%%QT_INCDIR%%/QtQuick/QQuickItemGrabResult %%QT_INCDIR%%/QtQuick/QQuickPaintedItem +%%QT_INCDIR%%/QtQuick/QQuickRenderControl %%QT_INCDIR%%/QtQuick/QQuickTextDocument %%QT_INCDIR%%/QtQuick/QQuickTextureFactory %%QT_INCDIR%%/QtQuick/QQuickTransform %%QT_INCDIR%%/QtQuick/QQuickView %%QT_INCDIR%%/QtQuick/QQuickWindow +%%QT_INCDIR%%/QtQuick/QSGAbstractRenderer %%QT_INCDIR%%/QtQuick/QSGBasicGeometryNode %%QT_INCDIR%%/QtQuick/QSGClipNode %%QT_INCDIR%%/QtQuick/QSGDynamicTexture +%%QT_INCDIR%%/QtQuick/QSGEngine %%QT_INCDIR%%/QtQuick/QSGFlatColorMaterial %%QT_INCDIR%%/QtQuick/QSGGeometry %%QT_INCDIR%%/QtQuick/QSGGeometryNode @@ -182,10 +197,14 @@ %%QT_INCDIR%%/QtQuick/qquickframebufferobject.h %%QT_INCDIR%%/QtQuick/qquickimageprovider.h %%QT_INCDIR%%/QtQuick/qquickitem.h +%%QT_INCDIR%%/QtQuick/qquickitemgrabresult.h %%QT_INCDIR%%/QtQuick/qquickpainteditem.h +%%QT_INCDIR%%/QtQuick/qquickrendercontrol.h %%QT_INCDIR%%/QtQuick/qquicktextdocument.h %%QT_INCDIR%%/QtQuick/qquickview.h %%QT_INCDIR%%/QtQuick/qquickwindow.h +%%QT_INCDIR%%/QtQuick/qsgabstractrenderer.h +%%QT_INCDIR%%/QtQuick/qsgengine.h %%QT_INCDIR%%/QtQuick/qsgflatcolormaterial.h %%QT_INCDIR%%/QtQuick/qsggeometry.h %%QT_INCDIR%%/QtQuick/qsgmaterial.h @@ -255,7 +274,6 @@ %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake %%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5Quick/Qt5Quick_AccessibleQuickFactory.cmake %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake @@ -286,7 +304,9 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug %%QT_BINDIR%%/qml %%QT_BINDIR%%/qmlbundle +%%QT_BINDIR%%/qmleasing %%QT_BINDIR%%/qmlimportscanner +%%QT_BINDIR%%/qmllint %%QT_BINDIR%%/qmlmin %%QT_BINDIR%%/qmlplugindump %%QT_BINDIR%%/qmlprofiler @@ -299,8 +319,6 @@ %%QT_MKSPECDIR%%/modules/qt_lib_quickparticles_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri -%%QT_PLUGINDIR%%/accessible/libqtaccessiblequick.so -%%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblequick.so.debug %%QT_PLUGINDIR%%/qmltooling/libqmldbg_qtquick2.so %%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_qtquick2.so.debug %%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so @@ -316,6 +334,10 @@ %%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug %%QT_QMLDIR%%/QtQml/Models.2/qmldir +%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so +%%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug +%%QT_QMLDIR%%/QtQml/StateMachine/plugins.qmltypes +%%QT_QMLDIR%%/QtQml/StateMachine/qmldir %%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so.debug %%QT_QMLDIR%%/QtQuick.2/plugins.qmltypes diff --git a/x11-toolkits/qt5-quickcontrols/pkg-plist b/x11-toolkits/qt5-quickcontrols/pkg-plist index 67fa7939053e..16f53d6929dc 100644 --- a/x11-toolkits/qt5-quickcontrols/pkg-plist +++ b/x11-toolkits/qt5-quickcontrols/pkg-plist @@ -15,6 +15,9 @@ %%QT_QMLDIR%%/QtQuick/Controls/Private/ColumnMenuContent.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/ContentItem.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/Control.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu_base.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu_ios.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/FastGlow.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/FocusFrame.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/HoverButton.qml @@ -31,7 +34,10 @@ %%QT_QMLDIR%%/QtQuick/Controls/Private/SystemPaletteSingleton.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TabBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewSelection.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/TextHandle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/TextInputWithHandles.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TextSingleton.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/ToolMenuButton.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Private/style.js %%QT_QMLDIR%%/QtQuick/Controls/ProgressBar.qml @@ -44,6 +50,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/StackViewDelegate.qml %%QT_QMLDIR%%/QtQuick/Controls/StackViewTransition.qml %%QT_QMLDIR%%/QtQuick/Controls/StatusBar.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ButtonStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CalendarStyle.qml @@ -95,6 +102,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/spinner_small.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/tab.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/tab_selected.png +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ApplicationWindowStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/BusyIndicatorStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/CalendarStyle.qml @@ -152,17 +160,18 @@ %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/copy.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/critical.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/crosshairs.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/folder.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/information.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/question.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/slider_handle.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/sunken_frame.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/up.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/warning.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/window_border.png %%QT_QMLDIR%%/QtQuick/Dialogs/plugins.qmltypes %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/ColorSlider.qml %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/IconButtonStyle.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/IconGlyph.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/icons.ttf %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir %%QT_QMLDIR%%/QtQuick/Dialogs/qmldir %%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index 74aa3349f5d2..eeee48719bbb 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -17,8 +17,7 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -MORE_WRKSRCS= src/plugins/accessible/${PORTNAME} \ - src/tools/uic +MORE_WRKSRCS= src/tools/uic QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC QT_CONFIG= accessibility accessibility-atspi-bridge xlib @@ -45,11 +44,6 @@ pre-build: ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} -post-build: - @cd ${WRKSRC}/src/plugins/accessible/${PORTNAME} && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ - ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} - post-install: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist index 5a9e49998b24..17acaf8c9548 100644 --- a/x11-toolkits/qt5-widgets/pkg-plist +++ b/x11-toolkits/qt5-widgets/pkg-plist @@ -3,13 +3,13 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractscrollarea_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractslider_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractspinbox_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgetfactory_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaction_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qandroidstyle_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qapplication_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbasickeyeventtransition_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbasicmouseeventtransition_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbsptree_p.h -%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcalendartextnavigator_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolordialog_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnview_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnviewgrip_p.h @@ -18,7 +18,7 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcommonstylepixmaps_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcompleter_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdatetimeedit_p.h -%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdesktopwidget_qpa_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdesktopwidget_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdialog_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdockarealayout_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdockwidget_p.h @@ -75,7 +75,6 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_wince_resource_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenubar_p.h -%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qopenglwidget_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpixmapfilter_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h @@ -116,7 +115,7 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetresizehandler_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p_p.h -%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetwindow_qpa_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetwindow_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowcontainer_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowscestyle_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowscestyle_p_p.h @@ -136,7 +135,45 @@ %%QT_INCDIR%%/QtWidgets/QAbstractScrollArea %%QT_INCDIR%%/QtWidgets/QAbstractSlider %%QT_INCDIR%%/QtWidgets/QAbstractSpinBox +%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractScrollArea +%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSlider +%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSpinBox +%%QT_INCDIR%%/QtWidgets/QAccessibleButton +%%QT_INCDIR%%/QtWidgets/QAccessibleCalendarWidget +%%QT_INCDIR%%/QtWidgets/QAccessibleComboBox +%%QT_INCDIR%%/QtWidgets/QAccessibleDial +%%QT_INCDIR%%/QtWidgets/QAccessibleDialogButtonBox +%%QT_INCDIR%%/QtWidgets/QAccessibleDisplay +%%QT_INCDIR%%/QtWidgets/QAccessibleDockWidget +%%QT_INCDIR%%/QtWidgets/QAccessibleDoubleSpinBox +%%QT_INCDIR%%/QtWidgets/QAccessibleGroupBox +%%QT_INCDIR%%/QtWidgets/QAccessibleLineEdit +%%QT_INCDIR%%/QtWidgets/QAccessibleMainWindow +%%QT_INCDIR%%/QtWidgets/QAccessibleMdiArea +%%QT_INCDIR%%/QtWidgets/QAccessibleMdiSubWindow +%%QT_INCDIR%%/QtWidgets/QAccessibleMenu +%%QT_INCDIR%%/QtWidgets/QAccessibleMenuBar +%%QT_INCDIR%%/QtWidgets/QAccessibleMenuItem +%%QT_INCDIR%%/QtWidgets/QAccessiblePlainTextEdit +%%QT_INCDIR%%/QtWidgets/QAccessibleProgressBar +%%QT_INCDIR%%/QtWidgets/QAccessibleScrollArea +%%QT_INCDIR%%/QtWidgets/QAccessibleScrollBar +%%QT_INCDIR%%/QtWidgets/QAccessibleSlider +%%QT_INCDIR%%/QtWidgets/QAccessibleSpinBox +%%QT_INCDIR%%/QtWidgets/QAccessibleStackedWidget +%%QT_INCDIR%%/QtWidgets/QAccessibleTabBar +%%QT_INCDIR%%/QtWidgets/QAccessibleTable +%%QT_INCDIR%%/QtWidgets/QAccessibleTableCell +%%QT_INCDIR%%/QtWidgets/QAccessibleTableCornerButton +%%QT_INCDIR%%/QtWidgets/QAccessibleTableHeaderCell +%%QT_INCDIR%%/QtWidgets/QAccessibleTextBrowser +%%QT_INCDIR%%/QtWidgets/QAccessibleTextEdit +%%QT_INCDIR%%/QtWidgets/QAccessibleTextWidget +%%QT_INCDIR%%/QtWidgets/QAccessibleToolBox +%%QT_INCDIR%%/QtWidgets/QAccessibleToolButton +%%QT_INCDIR%%/QtWidgets/QAccessibleTree %%QT_INCDIR%%/QtWidgets/QAccessibleWidget +%%QT_INCDIR%%/QtWidgets/QAccessibleWindowContainer %%QT_INCDIR%%/QtWidgets/QAction %%QT_INCDIR%%/QtWidgets/QActionGroup %%QT_INCDIR%%/QtWidgets/QApplication @@ -240,6 +277,7 @@ %%QT_INCDIR%%/QtWidgets/QMenuBar %%QT_INCDIR%%/QtWidgets/QMessageBox %%QT_INCDIR%%/QtWidgets/QMouseEventTransition +%%QT_INCDIR%%/QtWidgets/QOpenGLWidget %%QT_INCDIR%%/QtWidgets/QPanGesture %%QT_INCDIR%%/QtWidgets/QPinchGesture %%QT_INCDIR%%/QtWidgets/QPlainTextDocumentLayout @@ -349,13 +387,17 @@ %%QT_INCDIR%%/QtWidgets/QtWidgets %%QT_INCDIR%%/QtWidgets/QtWidgetsDepends %%QT_INCDIR%%/QtWidgets/QtWidgetsVersion +%%QT_INCDIR%%/QtWidgets/complexwidgets.h +%%QT_INCDIR%%/QtWidgets/itemviews.h %%QT_INCDIR%%/QtWidgets/qabstractbutton.h %%QT_INCDIR%%/QtWidgets/qabstractitemdelegate.h %%QT_INCDIR%%/QtWidgets/qabstractitemview.h %%QT_INCDIR%%/QtWidgets/qabstractscrollarea.h %%QT_INCDIR%%/QtWidgets/qabstractslider.h %%QT_INCDIR%%/QtWidgets/qabstractspinbox.h +%%QT_INCDIR%%/QtWidgets/qaccessiblemenu.h %%QT_INCDIR%%/QtWidgets/qaccessiblewidget.h +%%QT_INCDIR%%/QtWidgets/qaccessiblewidgets.h %%QT_INCDIR%%/QtWidgets/qaction.h %%QT_INCDIR%%/QtWidgets/qactiongroup.h %%QT_INCDIR%%/QtWidgets/qapplication.h @@ -428,6 +470,7 @@ %%QT_INCDIR%%/QtWidgets/qmenubar.h %%QT_INCDIR%%/QtWidgets/qmessagebox.h %%QT_INCDIR%%/QtWidgets/qmouseeventtransition.h +%%QT_INCDIR%%/QtWidgets/qopenglwidget.h %%QT_INCDIR%%/QtWidgets/qplaintextedit.h %%QT_INCDIR%%/QtWidgets/qprogressbar.h %%QT_INCDIR%%/QtWidgets/qprogressdialog.h @@ -478,11 +521,12 @@ %%QT_INCDIR%%/QtWidgets/qwidgetaction.h %%QT_INCDIR%%/QtWidgets/qwidgetsfunctions_wince.h %%QT_INCDIR%%/QtWidgets/qwizard.h +%%QT_INCDIR%%/QtWidgets/rangecontrols.h +%%QT_INCDIR%%/QtWidgets/simplewidgets.h %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake -%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_AccessibleFactory.cmake %%QT_LIBDIR%%/libQt5Widgets.prl %%QT_LIBDIR%%/libQt5Widgets.so %%QT_LIBDIR%%/libQt5Widgets.so.5 @@ -492,7 +536,5 @@ %%QT_BINDIR%%/uic %%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri -%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so -%%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so.debug libdata/pkgconfig/Qt5Widgets.pc share/pixmaps/qt5logo.png |