Qt5 update to 5.13.0

For new features, check: https://wiki.qt.io/New_Features_in_Qt_5.13

Thanks to adridg who helped to fix a lot of packages.

Exp-run by:	antoine
PR:		238782
This commit is contained in:
Tobias C. Berner 2019-10-01 04:13:31 +00:00
parent 4c6b47d49f
commit c45de9579f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=513447
92 changed files with 2319 additions and 1193 deletions

View File

@ -21,13 +21,13 @@ qmake_ARGS?= # empty
.include "${USESDIR}/qmake.mk"
# Supported distribution arguments
_QT5_DISTS= 3d activeqt androidextras base canvas3d charts connectivity \
datavis3d declarative doc gamepad graphicaleffects imageformats \
location macextras multimedia networkauth purchasing \
quickcontrols2 quickcontrols remoteobjects script scxml sensors \
serialbus serialport speech svg tools translations \
virtualkeyboard wayland webchannel webengine websockets webview \
winextras x11extras xmlpatterns
_QT5_DISTS= 3d activeqt androidextras base charts connectivity datavis3d \
declarative doc gamepad graphicaleffects imageformats location \
lottie macextras multimedia networkauth purchasing quickcontrols \
quickcontrols2 remoteobjects script scxml sensors serialbus \
serialport speech svg tools translations virtualkeyboard wayland \
webchannel webengine webglplugin websockets webview winextras \
x11extras xmlpatterns
_QT_DISTS= ${_QT${_QT_VER}_DISTS}
# We only accept one item as an argument. The fetch target further below works
@ -170,7 +170,8 @@ CONFIGURE_ARGS+= -verbose
_EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in
. if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
@ -247,6 +248,7 @@ _QT_TOOLS+= ${UIC}
# The list of QtBase components that need to be linked into WRKSRC/lib for
# other QtBase ports. See below.
_QT5_BASE= core dbus gui network sql widgets
_QT5_ADDITIONAL_LINK?= # Ensure definition
.if ${_QT_VER:M5}
post-patch: gcc-post-patch
@ -332,6 +334,16 @@ qt5-pre-configure:
${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
# Allow linking of further libraries to the configure directory.
. if !empty(_QT5_ADDITIONAL_LINK)
. for dep in ${_QT5_ADDITIONAL_LINK}
${MKDIR} ${CONFIGURE_WRKSRC}/lib
. if ! empty(USE_QT:M${dep})
${LN} -sf ${QT_LIBDIR}/${qt-${dep}_LIB} ${CONFIGURE_WRKSRC}/lib
. endif
. endfor
. endif
post-install: qt-post-install
qt-post-install:
. if ${QT_DEFINES:N-*}

View File

@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5
QT5_VERSION?= 5.12.2
QT5_VERSION?= 5.13.0
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
@ -134,12 +134,12 @@ _USE_QT_ALL= assistant dbus declarative designer doc gui help \
_USE_QT_ALL+= sql-ibase
.endif
_USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \
_USE_QT5_ONLY= 3d buildtools charts concurrent connectivity \
core datavis3d diag examples gamepad \
graphicaleffects location networkauth paths phonon4 plugininfo printsupport \
qdbus qdoc qdoc-data qev quickcontrols \
quickcontrols2 remoteobjects scxml sensors serialbus serialport speech \
sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
sql-tds uiplugin uitools virtualkeyboard wayland webchannel webglplugin \
webengine websockets websockets-qml webview widgets x11extras
# Dependency tuples: _LIB should be preferred if possible.
@ -152,9 +152,6 @@ qt-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant
qt-buildtools_PORT= devel/${_QT_RELNAME}-buildtools
qt-buildtools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
qt-canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
qt-canvas3d_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtCanvas3D/qmldir
qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
qt-charts_LIB= libQt${_QT_LIBVER}Charts.so
@ -326,6 +323,9 @@ qt-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
qt-webengine_PORT= www/${_QT_RELNAME}-webengine
qt-webengine_LIB= libQt${_QT_LIBVER}WebEngine.so
qt-webglplugin_PORT= www/${_QT_RELNAME}-webglplugin
qt-webglplugin_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforms/libqwebgl.so
qt-websockets_PORT= www/${_QT_RELNAME}-websockets
qt-websockets_LIB= libQt${_QT_LIBVER}WebSockets.so

View File

@ -2,7 +2,6 @@
PORTNAME= speech
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= accessibility
PKGNAMEPREFIX= qt5-

View File

@ -69,12 +69,14 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferrequest_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothutils_winrt_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qleadvertiser_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_android_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontrollerbase_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergyserviceprivate_p.h

View File

@ -32,6 +32,7 @@
%%QT_INCDIR%%/QtSerialBus/QModbusRtuSerialSlave
%%QT_INCDIR%%/QtSerialBus/QModbusServer
%%QT_INCDIR%%/QtSerialBus/QModbusTcpClient
%%QT_INCDIR%%/QtSerialBus/QModbusTcpConnectionObserver
%%QT_INCDIR%%/QtSerialBus/QModbusTcpServer
%%QT_INCDIR%%/QtSerialBus/QtSerialBus
%%QT_INCDIR%%/QtSerialBus/QtSerialBusDepends
@ -54,6 +55,7 @@
%%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h
%%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h
%%QT_INCDIR%%/QtSerialBus/qtserialbus-config.h
%%QT_INCDIR%%/QtSerialBus/qtserialbusglobal.h
%%QT_INCDIR%%/QtSerialBus/qtserialbusversion.h
%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfig.cmake
%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake

View File

@ -34,6 +34,6 @@ post-patch:
pre-configure:
#Work around badly written .pro
${LRELEASE} ${WRKSRC}/${PORTNAME}.pro
cd ${WRKSRC} && ${LRELEASE} ${WRKSRC}/${PORTNAME}.pro
.include <bsd.port.mk>

View File

@ -0,0 +1,30 @@
https://github.com/steveire/grantlee/commit/1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85.patch
From 1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85 Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Tue, 18 Dec 2018 17:47:21 -0500
Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
At this point Grantlee doesn't build for me because QList is an
incomplete type. I think the compiler is right to complain, so I fix by
including the appropriate header.
Fixes issue #47.
---
templates/lib/lexer_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
index 275aeea..1ae451a 100644
--- templates/lib/lexer_p.h
+++ templates/lib/lexer_p.h
@@ -24,7 +24,7 @@
#include "textprocessingmachine_p.h"
#include "token.h"
-template <typename T> class QList;
+#include <QList>
namespace Grantlee
{

View File

@ -21,6 +21,9 @@ DESKTOP_ENTRIES="Qt 5 Assistant" "" \
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}
INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}
# Link in QtHelp port
_QT5_ADDITIONAL_LINK= help
post-install:
${INSTALL_DATA} ${INSTALL_WRKSRC}/images/assistant-128.png \
${STAGEDIR}${PREFIX}/share/pixmaps/assistant-qt5.png

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:40:06 UTC
--- src/src.pro.orig 2019-02-14 20:24:23 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -2,7 +2,6 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View File

@ -109,6 +109,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnumeric_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qobject_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoffsetstringarray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoperatingsystemversion_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoperatingsystemversion_win_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h
@ -139,6 +140,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/qstdweb_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h
@ -159,6 +161,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtools_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtrace_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtranslator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtransposeproxymodel_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtsciicodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qunicodetables_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qunicodetools_p.h
@ -222,6 +225,7 @@
%%QT_INCDIR%%/QtCore/QCollatorSortKey
%%QT_INCDIR%%/QtCore/QCommandLineOption
%%QT_INCDIR%%/QtCore/QCommandLineParser
%%QT_INCDIR%%/QtCore/QConcatenateTablesProxyModel
%%QT_INCDIR%%/QtCore/QConstOverload
%%QT_INCDIR%%/QtCore/QContiguousCache
%%QT_INCDIR%%/QtCore/QContiguousCacheData
@ -453,6 +457,7 @@
%%QT_INCDIR%%/QtCore/QTimer
%%QT_INCDIR%%/QtCore/QTimerEvent
%%QT_INCDIR%%/QtCore/QTranslator
%%QT_INCDIR%%/QtCore/QTransposeProxyModel
%%QT_INCDIR%%/QtCore/QTypeInfo
%%QT_INCDIR%%/QtCore/QTypeInfoMerger
%%QT_INCDIR%%/QtCore/QTypeInfoQuery
@ -543,6 +548,7 @@
%%QT_INCDIR%%/QtCore/qcommandlineoption.h
%%QT_INCDIR%%/QtCore/qcommandlineparser.h
%%QT_INCDIR%%/QtCore/qcompilerdetection.h
%%QT_INCDIR%%/QtCore/qconcatenatetablesproxymodel.h
%%QT_INCDIR%%/QtCore/qconfig-bootstrapped.h
%%QT_INCDIR%%/QtCore/qconfig.h
%%QT_INCDIR%%/QtCore/qcontainerfwd.h
@ -689,6 +695,7 @@
%%QT_INCDIR%%/QtCore/qtimer.h
%%QT_INCDIR%%/QtCore/qtimezone.h
%%QT_INCDIR%%/QtCore/qtranslator.h
%%QT_INCDIR%%/QtCore/qtransposeproxymodel.h
%%QT_INCDIR%%/QtCore/qtypeinfo.h
%%QT_INCDIR%%/QtCore/qtypetraits.h
%%QT_INCDIR%%/QtCore/qurl.h

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 19:49:07 UTC
--- src/src.pro.orig 2019-02-14 20:38:18 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:25:44 UTC
--- src/src.pro.orig 2019-02-14 19:59:04 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -4,12 +4,15 @@
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
%%QT_INCDIR%%/QtHelp/QCompressedHelpInfo
%%QT_INCDIR%%/QtHelp/QHelpContentItem
%%QT_INCDIR%%/QtHelp/QHelpContentModel
%%QT_INCDIR%%/QtHelp/QHelpContentWidget
%%QT_INCDIR%%/QtHelp/QHelpEngine
%%QT_INCDIR%%/QtHelp/QHelpEngineCore
%%QT_INCDIR%%/QtHelp/QHelpGlobal
%%QT_INCDIR%%/QtHelp/QHelpFilterData
%%QT_INCDIR%%/QtHelp/QHelpFilterEngine
%%QT_INCDIR%%/QtHelp/QHelpIndexModel
%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
@ -20,10 +23,13 @@
%%QT_INCDIR%%/QtHelp/QtHelp
%%QT_INCDIR%%/QtHelp/QtHelpDepends
%%QT_INCDIR%%/QtHelp/QtHelpVersion
%%QT_INCDIR%%/QtHelp/qcompressedhelpinfo.h
%%QT_INCDIR%%/QtHelp/qhelp_global.h
%%QT_INCDIR%%/QtHelp/qhelpcontentwidget.h
%%QT_INCDIR%%/QtHelp/qhelpengine.h
%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
%%QT_INCDIR%%/QtHelp/qhelpfilterdata.h
%%QT_INCDIR%%/QtHelp/qhelpfilterengine.h
%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 19:54:17 UTC
--- src/src.pro.orig 2019-02-14 20:52:15 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:35:56 UTC
--- src/src.pro.orig 2019-02-14 20:23:20 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -58,4 +58,4 @@ missing dependencies.
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS += linguist
+SUBDIRS = linguist

View File

@ -11,9 +11,17 @@ We chose the third option. To patch qmake's internal cmake generation function
to fix up the paths so that cmake files still land in the the "correct" location
in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
--- src/linguist/linguist.pro.orig 2016-06-03 17:47:52 UTC
--- src/linguist/linguist.pro.orig 2019-02-06 13:19:48 UTC
+++ src/linguist/linguist.pro
@@ -17,7 +17,7 @@ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPa
@@ -9,7 +9,6 @@ SUBDIRS = \
!no-png:qtHaveModule(widgets) {
QT_FOR_CONFIG += widgets
qtConfig(process):qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS += linguist
}
}
@@ -25,7 +24,7 @@ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTA
contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
@ -22,7 +30,7 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
# We need to go up another two levels because the CMake files are
# installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
@@ -27,7 +27,7 @@ CMAKE_LIB_DIR = $$cmakeRelativePath($$[Q
@@ -35,7 +34,7 @@ CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS
}
CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
@ -31,11 +39,11 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
CMAKE_BIN_DIR = $$[QT_HOST_BINS]/
CMAKE_BIN_DIR_IS_ABSOLUTE = True
}
@@ -45,6 +45,6 @@ cmake_linguist_macros_file.CONFIG = verb
@@ -53,6 +52,6 @@ cmake_linguist_macros_file.CONFIG = verbatim
QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file
cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_config_version_file.output $$cmake_linguist_macros_file.output
-cmake_linguist_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5LinguistTools
+cmake_linguist_tools_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5LinguistTools
cmake_linguist_tools_files.CONFIG = no_check_exists
cmake_linguist_tools_files.CONFIG = no_check_exist
INSTALLS += cmake_linguist_tools_files

View File

@ -0,0 +1,19 @@
This is upstream as
https://code.qt.io/cgit/qt/qttools.git/commit/src/linguist/lrelease?h=5.13.1&id=6a832f5474d3b4f789e4bcdebcd425e5ec98423f
in 5.13.1
--- src/linguist/lrelease/main.cpp.orig 2019-09-01 11:53:23 UTC
+++ src/linguist/lrelease/main.cpp
@@ -180,7 +180,9 @@ static QStringList translationsFromProjects(const Proj
static QStringList translationsFromProject(const Project &project, bool topLevel)
{
- QStringList result = *project.translations;
+ QStringList result;
+ if (project.translations)
+ result << *project.translations;
result << translationsFromProjects(project.subProjects, false);
if (topLevel && result.isEmpty()) {
printErr(LR::tr("lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1'\n")

View File

@ -0,0 +1,10 @@
--- src/linguist/shared/runqttool.cpp.orig 2019-02-14 20:37:05 UTC
+++ src/linguist/shared/runqttool.cpp
@@ -36,6 +36,7 @@
#include <cstdlib>
#include <iostream>
+#include <sys/wait.h>
class FMT {
Q_DECLARE_TR_FUNCTIONS(Linguist)

View File

@ -2,7 +2,10 @@
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
%%QT_BINDIR%%/lconvert
%%QT_BINDIR%%/lprodump
%%QT_BINDIR%%/lrelease
%%QT_BINDIR%%/lrelease-pro
%%QT_BINDIR%%/lupdate
%%QT_BINDIR%%/lupdate-pro
man/man1/lrelease.1.gz
man/man1/lupdate.1.gz

View File

@ -49,6 +49,7 @@
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanager_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanagerengine_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeofiletilecache_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeojson_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaneuver_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p_p.h
@ -222,8 +223,6 @@
%%QT_INCDIR%%/QtLocation/qtlocation-config.h
%%QT_INCDIR%%/QtLocation/qtlocationversion.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qclipperutils_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdeclarativegeoaddress_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdeclarativegeolocation_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdoublematrix4x4_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdoublevector2d_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdoublevector3d_p.h
@ -233,6 +232,7 @@
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeocoordinateobject_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeolocation_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopath_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
@ -251,7 +251,6 @@
%%QT_INCDIR%%/QtPositioning/QGeoLocation
%%QT_INCDIR%%/QtPositioning/QGeoPath
%%QT_INCDIR%%/QtPositioning/QGeoPolygon
%%QT_INCDIR%%/QtPositioning/QGeoPolygonPrivate
%%QT_INCDIR%%/QtPositioning/QGeoPositionInfo
%%QT_INCDIR%%/QtPositioning/QGeoPositionInfoSource
%%QT_INCDIR%%/QtPositioning/QGeoPositionInfoSourceFactory
@ -282,6 +281,8 @@
%%QT_INCDIR%%/QtPositioning/qpositioningglobal.h
%%QT_INCDIR%%/QtPositioning/qtpositioning-config.h
%%QT_INCDIR%%/QtPositioning/qtpositioningversion.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeolocation_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativeposition_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativepositionsource_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qpositioningquickglobal_p.h

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies
--- src/src.pro.orig 2019-03-18 18:07:43 UTC
--- src/src.pro.orig 2019-02-14 19:41:39 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:27:32 UTC
--- src/src.pro.orig 2019-02-14 20:02:00 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -1,4 +1,7 @@
--- src/src.pro.orig 2019-03-18 18:40:57 UTC
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:14:11 UTC
+++ src/src.pro
@@ -1,54 +1,5 @@
TEMPLATE = subdirs

View File

@ -2,7 +2,6 @@
PORTNAME= qmake
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View File

@ -64,6 +64,7 @@
%%QT_MKSPECDIR%%/common/uikit/qmake.conf
%%QT_MKSPECDIR%%/common/unix.conf
%%QT_MKSPECDIR%%/common/watchos.conf
%%QT_MKSPECDIR%%/common/windows-desktop.conf
%%QT_MKSPECDIR%%/common/windows-vulkan.conf
%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_150x150.png
%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_30x30.png
@ -170,6 +171,7 @@
%%QT_MKSPECDIR%%/features/cmdline.prf
%%QT_MKSPECDIR%%/features/configure.prf
%%QT_MKSPECDIR%%/features/configure_base.prf
%%QT_MKSPECDIR%%/features/coverage.prf
%%QT_MKSPECDIR%%/features/create_cmake.prf
%%QT_MKSPECDIR%%/features/ctest_testcase.prf
%%QT_MKSPECDIR%%/features/ctest_testcase_common.prf
@ -257,6 +259,8 @@
%%QT_MKSPECDIR%%/features/resolve_config.prf
%%QT_MKSPECDIR%%/features/resolve_target.prf
%%QT_MKSPECDIR%%/features/resources.prf
%%QT_MKSPECDIR%%/features/rtti.prf
%%QT_MKSPECDIR%%/features/rtti_off.prf
%%QT_MKSPECDIR%%/features/sanitizer.prf
%%QT_MKSPECDIR%%/features/silent.prf
%%QT_MKSPECDIR%%/features/simd.prf
@ -309,13 +313,12 @@
%%QT_MKSPECDIR%%/features/win32/msvc_mp.prf
%%QT_MKSPECDIR%%/features/win32/opengl.prf
%%QT_MKSPECDIR%%/features/win32/qt_dll.prf
%%QT_MKSPECDIR%%/features/win32/rtti.prf
%%QT_MKSPECDIR%%/features/win32/rtti_off.prf
%%QT_MKSPECDIR%%/features/win32/separate_debug_info.prf
%%QT_MKSPECDIR%%/features/win32/stl.prf
%%QT_MKSPECDIR%%/features/win32/stl_off.prf
%%QT_MKSPECDIR%%/features/win32/windeployqt.prf
%%QT_MKSPECDIR%%/features/win32/windows.prf
%%QT_MKSPECDIR%%/features/win32/windows_vulkan_sdk.prf
%%QT_MKSPECDIR%%/features/winrt/console.prf
%%QT_MKSPECDIR%%/features/winrt/default_pre.prf
%%QT_MKSPECDIR%%/features/winrt/package_manifest.prf
@ -343,6 +346,10 @@
%%QT_MKSPECDIR%%/linux-aarch64-gnu-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qmake.conf
%%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-clang-32/qmake.conf
%%QT_MKSPECDIR%%/linux-clang-32/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-clang-libc++-32/qmake.conf
%%QT_MKSPECDIR%%/linux-clang-libc++-32/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-clang-libc++/qmake.conf
%%QT_MKSPECDIR%%/linux-clang-libc++/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-clang/qmake.conf
@ -469,13 +476,21 @@
%%QT_MKSPECDIR%%/winrt-arm-msvc2015/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-arm-msvc2017/qmake.conf
%%QT_MKSPECDIR%%/winrt-arm-msvc2017/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-arm-msvc2019/qmake.conf
%%QT_MKSPECDIR%%/winrt-arm-msvc2019/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-arm64-msvc2017/qmake.conf
%%QT_MKSPECDIR%%/winrt-arm64-msvc2017/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-arm64-msvc2019/qmake.conf
%%QT_MKSPECDIR%%/winrt-arm64-msvc2019/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qmake.conf
%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x64-msvc2017/qmake.conf
%%QT_MKSPECDIR%%/winrt-x64-msvc2017/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x64-msvc2019/qmake.conf
%%QT_MKSPECDIR%%/winrt-x64-msvc2019/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x86-msvc2015/qmake.conf
%%QT_MKSPECDIR%%/winrt-x86-msvc2015/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x86-msvc2017/qmake.conf
%%QT_MKSPECDIR%%/winrt-x86-msvc2017/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x86-msvc2019/qmake.conf
%%QT_MKSPECDIR%%/winrt-x86-msvc2019/qplatformdefs.h

View File

@ -16,4 +16,7 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}
# Link in QtScript port
_QT5_ADDITIONAL_LINK= script
.include <bsd.port.mk>

View File

@ -45,6 +45,7 @@
%%QT_INCDIR%%/QtTest/QTestKeyClicksEvent
%%QT_INCDIR%%/QtTest/QTestKeyEvent
%%QT_INCDIR%%/QtTest/QTestMouseEvent
%%QT_INCDIR%%/QtTest/QtCoverageScanner
%%QT_INCDIR%%/QtTest/QtTest
%%QT_INCDIR%%/QtTest/QtTestDepends
%%QT_INCDIR%%/QtTest/QtTestGui

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:39:04 UTC
--- src/src.pro.orig 2019-02-14 20:09:32 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -1,79 +1,81 @@
TIMESTAMP = 1552888505
SHA256 (KDE/Qt/5.12.2/qt3d-everywhere-src-5.12.2.tar.xz) = d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06
SIZE (KDE/Qt/5.12.2/qt3d-everywhere-src-5.12.2.tar.xz) = 84950848
SHA256 (KDE/Qt/5.12.2/qtactiveqt-everywhere-src-5.12.2.tar.xz) = 281ec22e43c5e8385ed7da0ad7f317cf200bc6c2b72e6980e7c1c318635c636b
SIZE (KDE/Qt/5.12.2/qtactiveqt-everywhere-src-5.12.2.tar.xz) = 261972
SHA256 (KDE/Qt/5.12.2/qtandroidextras-everywhere-src-5.12.2.tar.xz) = a48e524b0b4e43f3784083f956fda29eb388b7beb7b8bb4f786d9ed8cbc5ef92
SIZE (KDE/Qt/5.12.2/qtandroidextras-everywhere-src-5.12.2.tar.xz) = 104672
SHA256 (KDE/Qt/5.12.2/qtbase-everywhere-src-5.12.2.tar.xz) = 562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1
SIZE (KDE/Qt/5.12.2/qtbase-everywhere-src-5.12.2.tar.xz) = 48364464
SHA256 (KDE/Qt/5.12.2/qtcanvas3d-everywhere-src-5.12.2.tar.xz) = 5e74b083294956505945621f6f56a3d7a314502277a109d6fb6b25c74dea2dca
SIZE (KDE/Qt/5.12.2/qtcanvas3d-everywhere-src-5.12.2.tar.xz) = 10915092
SHA256 (KDE/Qt/5.12.2/qtcharts-everywhere-src-5.12.2.tar.xz) = 11d88d3e0ec86730219f7c2efa17f696ec8766415c488b208bfcb8f3c3a68a31
SIZE (KDE/Qt/5.12.2/qtcharts-everywhere-src-5.12.2.tar.xz) = 4242568
SHA256 (KDE/Qt/5.12.2/qtconnectivity-everywhere-src-5.12.2.tar.xz) = 15eb21a1c102408e43c7204a82ad144e97ebe05dc4a15edb0900cd49762a226e
SIZE (KDE/Qt/5.12.2/qtconnectivity-everywhere-src-5.12.2.tar.xz) = 2750052
SHA256 (KDE/Qt/5.12.2/qtdatavis3d-everywhere-src-5.12.2.tar.xz) = 4758a8126335e90f194c2a3aadd4db5eb2e3926e34faf908695945aa4f0d4690
SIZE (KDE/Qt/5.12.2/qtdatavis3d-everywhere-src-5.12.2.tar.xz) = 5201424
SHA256 (KDE/Qt/5.12.2/qtdeclarative-everywhere-src-5.12.2.tar.xz) = 470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b
SIZE (KDE/Qt/5.12.2/qtdeclarative-everywhere-src-5.12.2.tar.xz) = 20496648
SHA256 (KDE/Qt/5.12.2/qtdoc-everywhere-src-5.12.2.tar.xz) = ced15d42f1be7057e928d612e548ae5a0560f000328c4db9fd343bbbb18f7fe1
SIZE (KDE/Qt/5.12.2/qtdoc-everywhere-src-5.12.2.tar.xz) = 5649800
SHA256 (KDE/Qt/5.12.2/qtgamepad-everywhere-src-5.12.2.tar.xz) = d289d8c983f4e88018c9ccb22bbde196c9f97efd20ecd48ae92994885f2334a7
SIZE (KDE/Qt/5.12.2/qtgamepad-everywhere-src-5.12.2.tar.xz) = 385808
SHA256 (KDE/Qt/5.12.2/qtgraphicaleffects-everywhere-src-5.12.2.tar.xz) = 429398b6c661897b3c7cd62fb3657a2de60ad9152578edeeca0abde6e7ae5a86
SIZE (KDE/Qt/5.12.2/qtgraphicaleffects-everywhere-src-5.12.2.tar.xz) = 14271176
SHA256 (KDE/Qt/5.12.2/qtimageformats-everywhere-src-5.12.2.tar.xz) = 1ea757728f205deb6b3f5873f5c7c3129cded5993077500a9fb249559bee7a9c
SIZE (KDE/Qt/5.12.2/qtimageformats-everywhere-src-5.12.2.tar.xz) = 1788388
SHA256 (KDE/Qt/5.12.2/qtlocation-everywhere-src-5.12.2.tar.xz) = a31f27f457ac57e7203ae808b95ba0053d182e22425de03840af761e343d8bef
SIZE (KDE/Qt/5.12.2/qtlocation-everywhere-src-5.12.2.tar.xz) = 5907108
SHA256 (KDE/Qt/5.12.2/qtmacextras-everywhere-src-5.12.2.tar.xz) = b793a8ba24282c7c695be0e17ad6120264593efd744b22f8dacba4c356044160
SIZE (KDE/Qt/5.12.2/qtmacextras-everywhere-src-5.12.2.tar.xz) = 68668
SHA256 (KDE/Qt/5.12.2/qtmultimedia-everywhere-src-5.12.2.tar.xz) = 5d3c90c546e64abf523432a3df5e7a3f1b5ad72e7d0b5ea6260729fbefeb30f5
SIZE (KDE/Qt/5.12.2/qtmultimedia-everywhere-src-5.12.2.tar.xz) = 3745076
SHA256 (KDE/Qt/5.12.2/qtnetworkauth-everywhere-src-5.12.2.tar.xz) = 5876c1d8e37238eca8d5fbc945dfeb90bac013597bcac5c5beff23c12a8a4383
SIZE (KDE/Qt/5.12.2/qtnetworkauth-everywhere-src-5.12.2.tar.xz) = 139104
SHA256 (KDE/Qt/5.12.2/qtpurchasing-everywhere-src-5.12.2.tar.xz) = d3466f764d99918c07b9e68301af4572002a32cf3138393853fc0b83d3955caa
SIZE (KDE/Qt/5.12.2/qtpurchasing-everywhere-src-5.12.2.tar.xz) = 207828
SHA256 (KDE/Qt/5.12.2/qtquickcontrols2-everywhere-src-5.12.2.tar.xz) = 1fbd703612a2c0257861e07a2b709f6fbad00cb6df70a1c2c1fafa9de522e549
SIZE (KDE/Qt/5.12.2/qtquickcontrols2-everywhere-src-5.12.2.tar.xz) = 9291844
SHA256 (KDE/Qt/5.12.2/qtquickcontrols-everywhere-src-5.12.2.tar.xz) = 9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e
SIZE (KDE/Qt/5.12.2/qtquickcontrols-everywhere-src-5.12.2.tar.xz) = 6054972
SHA256 (KDE/Qt/5.12.2/qtremoteobjects-everywhere-src-5.12.2.tar.xz) = 2ae04817cd67c8550ccc685e6db9ca78ed2d7ec0b90e1de28a9fd7cda88d9811
SIZE (KDE/Qt/5.12.2/qtremoteobjects-everywhere-src-5.12.2.tar.xz) = 336052
SHA256 (KDE/Qt/5.12.2/qtscript-everywhere-src-5.12.2.tar.xz) = f8717d51072b4d4455755ae081e45f23f3d0ce25602f96231dd7703bd818a2e6
SIZE (KDE/Qt/5.12.2/qtscript-everywhere-src-5.12.2.tar.xz) = 2673104
SHA256 (KDE/Qt/5.12.2/qtscxml-everywhere-src-5.12.2.tar.xz) = 69592542fdf4b2efe6a6378ecb1bfdda9e7f48007e191d7f77a0009e213a8623
SIZE (KDE/Qt/5.12.2/qtscxml-everywhere-src-5.12.2.tar.xz) = 434184
SHA256 (KDE/Qt/5.12.2/qtsensors-everywhere-src-5.12.2.tar.xz) = 758a131ad86c4b8b8364e48d659a680ed12d03c091c5ab2958d06b7b0aa2e50c
SIZE (KDE/Qt/5.12.2/qtsensors-everywhere-src-5.12.2.tar.xz) = 2036148
SHA256 (KDE/Qt/5.12.2/qtserialbus-everywhere-src-5.12.2.tar.xz) = 16bfee0be81805d82d4f9c04425b5bc2678ca01fa1617fc72613a893438aaa48
SIZE (KDE/Qt/5.12.2/qtserialbus-everywhere-src-5.12.2.tar.xz) = 328700
SHA256 (KDE/Qt/5.12.2/qtserialport-everywhere-src-5.12.2.tar.xz) = 72163cedda4c6fa787db8666bec6b5057272dc87bf8de6addba3440dd472bd7f
SIZE (KDE/Qt/5.12.2/qtserialport-everywhere-src-5.12.2.tar.xz) = 302792
SHA256 (KDE/Qt/5.12.2/qtspeech-everywhere-src-5.12.2.tar.xz) = 5ad4b5931d6a677d8c4569a2a9147b992653962b339bd2f233400ffb43955911
SIZE (KDE/Qt/5.12.2/qtspeech-everywhere-src-5.12.2.tar.xz) = 99828
SHA256 (KDE/Qt/5.12.2/qtsvg-everywhere-src-5.12.2.tar.xz) = ed9f2118a6d33f53e5d9ed18dcd36f252a4fbaf68382a1c4a663ba75b25ae7bd
SIZE (KDE/Qt/5.12.2/qtsvg-everywhere-src-5.12.2.tar.xz) = 1859108
SHA256 (KDE/Qt/5.12.2/qttools-everywhere-src-5.12.2.tar.xz) = 4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005
SIZE (KDE/Qt/5.12.2/qttools-everywhere-src-5.12.2.tar.xz) = 9808600
SHA256 (KDE/Qt/5.12.2/qttranslations-everywhere-src-5.12.2.tar.xz) = bbe47b3995be8528ee5e78eae263a5ec224cd18e588219191716a17802e60c7b
SIZE (KDE/Qt/5.12.2/qttranslations-everywhere-src-5.12.2.tar.xz) = 1372756
SHA256 (KDE/Qt/5.12.2/qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz) = 7111de5c78f8a0d29394409727647b90ae5906fd5105c843af98c3ae3804248d
SIZE (KDE/Qt/5.12.2/qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz) = 10919524
SHA256 (KDE/Qt/5.12.2/qtwayland-everywhere-src-5.12.2.tar.xz) = b7840692420d106871433eb1b678277f09927d48ec6eb31a1851ee9c60d9df84
SIZE (KDE/Qt/5.12.2/qtwayland-everywhere-src-5.12.2.tar.xz) = 431976
SHA256 (KDE/Qt/5.12.2/qtwebchannel-everywhere-src-5.12.2.tar.xz) = 8eb9cff9492937daa1bf5d001e39afec68c310ce5596807345e2a555dcc80b8e
SIZE (KDE/Qt/5.12.2/qtwebchannel-everywhere-src-5.12.2.tar.xz) = 182736
SHA256 (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493
SIZE (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 249240772
SHA256 (KDE/Qt/5.12.2/qtwebsockets-everywhere-src-5.12.2.tar.xz) = ab9ce815b1466abe52910c9b50c0f61df8af74f9521574bb534f7f562d0e8c04
SIZE (KDE/Qt/5.12.2/qtwebsockets-everywhere-src-5.12.2.tar.xz) = 235208
SHA256 (KDE/Qt/5.12.2/qtwebview-everywhere-src-5.12.2.tar.xz) = 44c131e2f21aded85424e355f433ac51d81925065d21b113568c6d62cf73ee90
SIZE (KDE/Qt/5.12.2/qtwebview-everywhere-src-5.12.2.tar.xz) = 130972
SHA256 (KDE/Qt/5.12.2/qtwinextras-everywhere-src-5.12.2.tar.xz) = 3141027c4f7dbb2bcef8a35fd60d673adfff0e4fb20c36f73930570252136787
SIZE (KDE/Qt/5.12.2/qtwinextras-everywhere-src-5.12.2.tar.xz) = 759968
SHA256 (KDE/Qt/5.12.2/qtx11extras-everywhere-src-5.12.2.tar.xz) = 711f39ddc6237787a5522278be235fe3af547a4674bb265e6dff5c2892fe6084
SIZE (KDE/Qt/5.12.2/qtx11extras-everywhere-src-5.12.2.tar.xz) = 115860
SHA256 (KDE/Qt/5.12.2/qtxmlpatterns-everywhere-src-5.12.2.tar.xz) = 2e535ec17b542f2a0b87a9db93284666015cc07b6188894ace7e75104c6d860d
SIZE (KDE/Qt/5.12.2/qtxmlpatterns-everywhere-src-5.12.2.tar.xz) = 1389320
TIMESTAMP = 1561315565
SHA256 (KDE/Qt/5.13.0/qt3d-everywhere-src-5.13.0.tar.xz) = 9f6b317acbcf483bf78465956669957eb19fdd8df610e9a580d42017e629ec4f
SIZE (KDE/Qt/5.13.0/qt3d-everywhere-src-5.13.0.tar.xz) = 84982424
SHA256 (KDE/Qt/5.13.0/qtactiveqt-everywhere-src-5.13.0.tar.xz) = 7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323
SIZE (KDE/Qt/5.13.0/qtactiveqt-everywhere-src-5.13.0.tar.xz) = 263492
SHA256 (KDE/Qt/5.13.0/qtandroidextras-everywhere-src-5.13.0.tar.xz) = d49a2e60348affb4cf367d29ed307d162ace27e41c5a947dd7c712d816dccea2
SIZE (KDE/Qt/5.13.0/qtandroidextras-everywhere-src-5.13.0.tar.xz) = 105200
SHA256 (KDE/Qt/5.13.0/qtbase-everywhere-src-5.13.0.tar.xz) = ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe
SIZE (KDE/Qt/5.13.0/qtbase-everywhere-src-5.13.0.tar.xz) = 48640652
SHA256 (KDE/Qt/5.13.0/qtcharts-everywhere-src-5.13.0.tar.xz) = 04e381ec287edf230583eb32fbcde40bce62119d3eabbe2978f4ce8366e36b27
SIZE (KDE/Qt/5.13.0/qtcharts-everywhere-src-5.13.0.tar.xz) = 4245840
SHA256 (KDE/Qt/5.13.0/qtconnectivity-everywhere-src-5.13.0.tar.xz) = 64fad0692c639d25295cc85f12526f3fe2eaeb51bcf47d8561ad00dd57ad5053
SIZE (KDE/Qt/5.13.0/qtconnectivity-everywhere-src-5.13.0.tar.xz) = 2758792
SHA256 (KDE/Qt/5.13.0/qtdatavis3d-everywhere-src-5.13.0.tar.xz) = 6f4e5dd8e7a94d117f374a9b66013e373f5c1ccf963ad6556bf1fc8baf783821
SIZE (KDE/Qt/5.13.0/qtdatavis3d-everywhere-src-5.13.0.tar.xz) = 5200160
SHA256 (KDE/Qt/5.13.0/qtdeclarative-everywhere-src-5.13.0.tar.xz) = b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9
SIZE (KDE/Qt/5.13.0/qtdeclarative-everywhere-src-5.13.0.tar.xz) = 20514784
SHA256 (KDE/Qt/5.13.0/qtdoc-everywhere-src-5.13.0.tar.xz) = 7e5202b83e91555c7f0842918332b4d623828002b46fde93014a32c6beea8106
SIZE (KDE/Qt/5.13.0/qtdoc-everywhere-src-5.13.0.tar.xz) = 5726900
SHA256 (KDE/Qt/5.13.0/qtgamepad-everywhere-src-5.13.0.tar.xz) = 6bc1086d8c6a36a80dfa939b5ecb372be8c913a81e2986d84302012eafdc4b63
SIZE (KDE/Qt/5.13.0/qtgamepad-everywhere-src-5.13.0.tar.xz) = 385944
SHA256 (KDE/Qt/5.13.0/qtgraphicaleffects-everywhere-src-5.13.0.tar.xz) = 33bf92d6560d4d7b87f3e99dfacbc9cafc7ea5ef3d40f00cc3777a005251d0ff
SIZE (KDE/Qt/5.13.0/qtgraphicaleffects-everywhere-src-5.13.0.tar.xz) = 14270956
SHA256 (KDE/Qt/5.13.0/qtimageformats-everywhere-src-5.13.0.tar.xz) = 91cb638e5f856acc17ab5a2e1a052dc91bb1af2bdbd7d99ba6a8a48f4a15f499
SIZE (KDE/Qt/5.13.0/qtimageformats-everywhere-src-5.13.0.tar.xz) = 1800908
SHA256 (KDE/Qt/5.13.0/qtlocation-everywhere-src-5.13.0.tar.xz) = 205a47d259841b3879c59d3054d8b1098d3b0e7b45c64ad327daedefb4421414
SIZE (KDE/Qt/5.13.0/qtlocation-everywhere-src-5.13.0.tar.xz) = 6112360
SHA256 (KDE/Qt/5.13.0/qtlottie-everywhere-src-5.13.0.tar.xz) = 5315e8a5d1ab76b61e1cf5f88f5ed43fe06b91ec732139902c9a242ac5ea714c
SIZE (KDE/Qt/5.13.0/qtlottie-everywhere-src-5.13.0.tar.xz) = 81940
SHA256 (KDE/Qt/5.13.0/qtmacextras-everywhere-src-5.13.0.tar.xz) = 6a4effe1378e9ce27d3731ff5306929d252587e2c3a81c04979b9609702527e1
SIZE (KDE/Qt/5.13.0/qtmacextras-everywhere-src-5.13.0.tar.xz) = 68800
SHA256 (KDE/Qt/5.13.0/qtmultimedia-everywhere-src-5.13.0.tar.xz) = 5076219d277083d2535e5f739d06783abe2e059e9d3fd9f924a1fa7970946d72
SIZE (KDE/Qt/5.13.0/qtmultimedia-everywhere-src-5.13.0.tar.xz) = 3743064
SHA256 (KDE/Qt/5.13.0/qtnetworkauth-everywhere-src-5.13.0.tar.xz) = 91ff879d0a9f7e8ff658fb569136f102ee9f25bd47852e97a1f39826c1932c0d
SIZE (KDE/Qt/5.13.0/qtnetworkauth-everywhere-src-5.13.0.tar.xz) = 140932
SHA256 (KDE/Qt/5.13.0/qtpurchasing-everywhere-src-5.13.0.tar.xz) = 8aba72cf543f3ef26d128824f844487beea319fbd155931a8771afcf48cdeb7e
SIZE (KDE/Qt/5.13.0/qtpurchasing-everywhere-src-5.13.0.tar.xz) = 207784
SHA256 (KDE/Qt/5.13.0/qtquickcontrols-everywhere-src-5.13.0.tar.xz) = a5c6d40e0432246129d3f350a9aa419901dd73f2e4f8af6efb7a3e86e57ae167
SIZE (KDE/Qt/5.13.0/qtquickcontrols-everywhere-src-5.13.0.tar.xz) = 6056676
SHA256 (KDE/Qt/5.13.0/qtquickcontrols2-everywhere-src-5.13.0.tar.xz) = a5cb7e6d68285203bfb1aee87551228879fa9d93d87be5c8bab38e5a79dc916d
SIZE (KDE/Qt/5.13.0/qtquickcontrols2-everywhere-src-5.13.0.tar.xz) = 9227220
SHA256 (KDE/Qt/5.13.0/qtremoteobjects-everywhere-src-5.13.0.tar.xz) = 24b2fc953ab4db7f46d8b7da38fef2483b2e9a51ea6836007077947e246fdadc
SIZE (KDE/Qt/5.13.0/qtremoteobjects-everywhere-src-5.13.0.tar.xz) = 346092
SHA256 (KDE/Qt/5.13.0/qtscript-everywhere-src-5.13.0.tar.xz) = 2323eb93a215b837d8d276f7f35e7dfb6a28b952d8b51fb92c60619813a37a80
SIZE (KDE/Qt/5.13.0/qtscript-everywhere-src-5.13.0.tar.xz) = 2674484
SHA256 (KDE/Qt/5.13.0/qtscxml-everywhere-src-5.13.0.tar.xz) = fcd5b347a51d47b70b8192a20934951bb80cafa18fa55413ffc9e1fcb1bb2766
SIZE (KDE/Qt/5.13.0/qtscxml-everywhere-src-5.13.0.tar.xz) = 434276
SHA256 (KDE/Qt/5.13.0/qtsensors-everywhere-src-5.13.0.tar.xz) = 1fae52836c786a9fd50e9e1d590384b9aea479f4569e33fc2d69536bbe2cde48
SIZE (KDE/Qt/5.13.0/qtsensors-everywhere-src-5.13.0.tar.xz) = 2036004
SHA256 (KDE/Qt/5.13.0/qtserialbus-everywhere-src-5.13.0.tar.xz) = 5ef8ce8d7dbdd4065e1a1e842d7effb7134ce262790fcd59076937f3b40b78f3
SIZE (KDE/Qt/5.13.0/qtserialbus-everywhere-src-5.13.0.tar.xz) = 330256
SHA256 (KDE/Qt/5.13.0/qtserialport-everywhere-src-5.13.0.tar.xz) = 2f58309789e1d6b3a2653922f932703cfffddaea06bff63a552900bd63beb985
SIZE (KDE/Qt/5.13.0/qtserialport-everywhere-src-5.13.0.tar.xz) = 302836
SHA256 (KDE/Qt/5.13.0/qtspeech-everywhere-src-5.13.0.tar.xz) = 1bfeea13cc23a9d9a02081f4e3378bc8ef51af5dfd684b261cf0a0e93be5b644
SIZE (KDE/Qt/5.13.0/qtspeech-everywhere-src-5.13.0.tar.xz) = 99952
SHA256 (KDE/Qt/5.13.0/qtsvg-everywhere-src-5.13.0.tar.xz) = 0f568e20d13418c6d8e395db2ce4d2d706d3fb470cd665853e3637a29fde0eaf
SIZE (KDE/Qt/5.13.0/qtsvg-everywhere-src-5.13.0.tar.xz) = 1859144
SHA256 (KDE/Qt/5.13.0/qttools-everywhere-src-5.13.0.tar.xz) = a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819
SIZE (KDE/Qt/5.13.0/qttools-everywhere-src-5.13.0.tar.xz) = 9083492
SHA256 (KDE/Qt/5.13.0/qttranslations-everywhere-src-5.13.0.tar.xz) = 2f8fb3b2c62fcf1aacd0b32432b960a83546384688c0ea78514e4cf4f2f94c28
SIZE (KDE/Qt/5.13.0/qttranslations-everywhere-src-5.13.0.tar.xz) = 1379324
SHA256 (KDE/Qt/5.13.0/qtvirtualkeyboard-everywhere-src-5.13.0.tar.xz) = 91483feb79c648ec8820a238ee2a12cf1aa117e8f3a5b06d069450e0c9ad42e9
SIZE (KDE/Qt/5.13.0/qtvirtualkeyboard-everywhere-src-5.13.0.tar.xz) = 10918808
SHA256 (KDE/Qt/5.13.0/qtwayland-everywhere-src-5.13.0.tar.xz) = b67a6d8119628bca3301bd03992880db07d61d405534067c9cd2a598695a7cf3
SIZE (KDE/Qt/5.13.0/qtwayland-everywhere-src-5.13.0.tar.xz) = 478076
SHA256 (KDE/Qt/5.13.0/qtwebchannel-everywhere-src-5.13.0.tar.xz) = 7f6260c73bca968511ab2facfbb14b4d8cc7a9c5b2d0f9211e7390ed8fb52b9a
SIZE (KDE/Qt/5.13.0/qtwebchannel-everywhere-src-5.13.0.tar.xz) = 183296
SHA256 (KDE/Qt/5.13.0/qtwebengine-everywhere-src-5.13.0.tar.xz) = e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe
SIZE (KDE/Qt/5.13.0/qtwebengine-everywhere-src-5.13.0.tar.xz) = 256899724
SHA256 (KDE/Qt/5.13.0/qtwebglplugin-everywhere-src-5.13.0.tar.xz) = b8f05ee429f3fb7d6cef789333ddb56aafdc30a83e05b04f5f9e05650146c06e
SIZE (KDE/Qt/5.13.0/qtwebglplugin-everywhere-src-5.13.0.tar.xz) = 73464
SHA256 (KDE/Qt/5.13.0/qtwebsockets-everywhere-src-5.13.0.tar.xz) = f941dd44f6e16041a25723c1b70ce9e28910c630509da0044ecb9fdda28a6e34
SIZE (KDE/Qt/5.13.0/qtwebsockets-everywhere-src-5.13.0.tar.xz) = 235516
SHA256 (KDE/Qt/5.13.0/qtwebview-everywhere-src-5.13.0.tar.xz) = 090da2f41b3ea40e73d3a7d7d873492bb911a3492376bb44daee917b459535a9
SIZE (KDE/Qt/5.13.0/qtwebview-everywhere-src-5.13.0.tar.xz) = 131236
SHA256 (KDE/Qt/5.13.0/qtwinextras-everywhere-src-5.13.0.tar.xz) = 096387a674f7fa1faeda856b87e965bd2937e3dcce334f10df694468003887d4
SIZE (KDE/Qt/5.13.0/qtwinextras-everywhere-src-5.13.0.tar.xz) = 759460
SHA256 (KDE/Qt/5.13.0/qtx11extras-everywhere-src-5.13.0.tar.xz) = f33fe1cf2258bc972171f723c6f37208da47f578b09876fea47c7ba558a8f1d6
SIZE (KDE/Qt/5.13.0/qtx11extras-everywhere-src-5.13.0.tar.xz) = 115876
SHA256 (KDE/Qt/5.13.0/qtxmlpatterns-everywhere-src-5.13.0.tar.xz) = 75186ff075d9a3bd30cee145bad6bc69d491b5e555b048d11136727f050d7319
SIZE (KDE/Qt/5.13.0/qtxmlpatterns-everywhere-src-5.13.0.tar.xz) = 1389724

View File

@ -0,0 +1,18 @@
Fix the location of the Qt5 libraries in the generated cmake files. Without this patch
we will get stuff like:
LINK_FLAGS = [...] /usr/local/lib/libQt5Widgets.so [...]
LINK_LIBRARIES= [...] /usr/local/lib/qt5/libQt5Widgets.so.5.13.0 [...]
in the generated build.ninja files, making the builds fail due to the wrong path in
LINK_FLAGS
--- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-06-13 04:18:18 UTC
+++ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -53,7 +53,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file p
set(_lib_deps)
set(_link_flags)
- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
+ get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib/qt5\" ABSOLUTE)
if(EXISTS \"${prl_file_location}\")
file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\")

View File

@ -140,234 +140,56 @@ libexec/qtcreator/qtcreator_process_stub
libexec/qtcreator/qtpromaker
libexec/qtcreator/sdktool
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev.qch
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/abstractsymbolgroupnode-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/abstractsymbolgroupnode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/aggregation.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/basesymbolgroupnode-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/animation.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/basesymbolgroupnode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/bench.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/classes.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/codeassist.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/coding-style.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/common-extension-tasks.html
@comment %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-fileiconprovider-sub-qt-creator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-locatorfilterentry-highlightinfo-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-fileiconprovider-sub-qt-creator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-locatorfilterentry-highlightinfo.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-locatorfilterentry-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-locatorfilterentry.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-navigationview-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-navigationview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-search-textposition-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-search-textposition.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-search-textrange-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-search-textrange.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-searchresultitem-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core-searchresultitem.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/core.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-alreadyconsideredclasscontainer-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-alreadyconsideredclasscontainer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-internal-fullyqualifiedname-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-internal-fullyqualifiedname.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-argument-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-argument.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-blanks-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-blanks.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-char-literal-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-char-literal.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-comment-or-divop-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-comment-or-divop.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-identifier-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-identifier.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-number-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-number.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-string-literal-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-string-literal.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-whitespaces-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus-pp-skip-whitespaces.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/cplusplus.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/creating-plugins.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugfiltersymbolgroupnodevisitor-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/currentsymbolgroup.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugfiltersymbolgroupnodevisitor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-core-locatorfilterentry-highlightinfo-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-core-locatorfilterentry-highlightinfo.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-core-locatorfilterentry-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-core-locatorfilterentry.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-addressdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-attachtoqmlportdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cachedirectorydialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbbreakeventwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbengine-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbengine-normalizedsourcefilename-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbengine-normalizedsourcefilename.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbengine.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdboptionspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdboptionspagewidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbpathspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cdbsymbolpathlisteditor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-commonoptionspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-console.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-consoleitem-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-consoleitem.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-contextdata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-contextdata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-coreinfo-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-coreinfo.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cppdebuggerengine-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-cppdebuggerengine.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggercommand-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggercommand.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggercommandsequence-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggercommandsequence.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerencoding-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerencoding.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerengine-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerengine.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerkitchooser-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerkitchooser.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerkitconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerresponse-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerresponse.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerrunparameters-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggerrunparameters.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggersettings.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-debuggersourcepathmappingwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-disassemblerline-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-disassemblerline.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-disassemblerlines-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-disassemblerlines.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-enginemanager.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-gdbengine-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-gdbengine.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-gdbmi-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-gdbmi.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-globaldebuggeroptions-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-globaldebuggeroptions.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-globallogwindow.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-lldbengine-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-lldbengine.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-localsandexpressionsoptionspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-location-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-location.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-locationmark-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-locationmark.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-logwindow.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-memoryagent.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-memorymarkup-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-memorymarkup.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-memoryviewsetupdata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-memoryviewsetupdata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-module-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-module.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-moduleshandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-outputcollector.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-qmlengine-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-qmlengine.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-register-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-register.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-registerhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-registervalue-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-registervalue.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-section-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-section.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-sourcefileshandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-stackframe-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-stackframe.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-stacktreeview-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-stacktreeview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-startapplicationdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-startremotecdbdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-startremoteenginedialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-stringinputstream.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-symbol-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-symbol.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-typeformatsdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-updateparameters-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-updateparameters.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-watchhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-watchitem-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-watchitem.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-watchmodelbase.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-watchtreeview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-winexception-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-debugger-internal-winexception.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-extensionsystem-invoker-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-extensionsystem-invoker.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-headerpath-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-headerpath.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-kitguard-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-kitguard.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-qmljs-ast-sourcelocation-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-qmljs-ast-sourcelocation.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-std-hash-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-std-hash.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-blockrange-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-blockrange.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-colorscheme-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-colorscheme.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-indenter-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-indenter.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-rangeinlines-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-rangeinlines.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-replacement-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-replacement.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-textstyles-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor-textstyles.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-texteditor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-basicsmallstring-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-basicsmallstring.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-basicsmallstringliteral-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-basicsmallstringliteral.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-basicsmallstringvector-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-basicsmallstringvector.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-elfprogramheader-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-elfprogramheader.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-elfsectionheader-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-elfsectionheader.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-allocatedlayout-data-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-allocatedlayout-data.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-allocatedlayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-allocatedlayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-referencelayout-data-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-referencelayout-data.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-referencelayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-referencelayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-shortstringlayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-shortstringlayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-smallstringiterator-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-smallstringiterator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-stringdatalayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-internal-stringdatalayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-link-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-link.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-sizedarray-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-sizedarray.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-smallstringview-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-smallstringview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-view-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-utils-view.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugsymbolgroupnodevisitor-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugprint.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugsequence.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugsymbolgroupnodevisitor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/dumpparameters-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/dumpparameters.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/dumpsymbolgroupnodevisitor-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/dumpsymbolgroupnodevisitor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/eventcallback-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/errorsymbolgroupnode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/eventcallback.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extending-index.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensioncommandcontext-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensioncommandcontext.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensioncontext-cdbversion-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensioncontext-cdbversion.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensioncontext-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensioncontext.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensionsystem-invoker-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensionsystem-invoker.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/extensionsystem.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/external-tool-spec.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/first-plugin.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/functions.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/gdbmistringformat.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/gdbmiwstringformat.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/getting-and-building.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/iinterfacepointer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/images/arrow_bc.png
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/images/bgrContent.png
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/images/btn_next.png
@ -399,247 +221,56 @@ libexec/qtcreator/sdktool
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/images/qtcreator-tooltip-long.png
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/images/qtcreator-tooltip.png
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/images/riot.png
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/localssymbolgroup-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/imageviewer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/localssymbolgroup.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/mainclasses.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/mapnodesymbolgroupnode-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/mapnodesymbolgroupnode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/memoryhandle.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/mymain.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/namespaces.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/outputcallback.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/plotviewer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/plugin-lifecycle.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/plugin-meta-data.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/pluginmanager.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-buildconfigurationmodel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-buildconfigurationmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-cache-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-cache.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-checkboxfield-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-checkboxfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-comboboxfield-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-comboboxfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customexecutablerunconfigurationfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customexecutablerunconfigurationfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customparser-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customparser.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customparserexpression-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customparserexpression.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customparsersettings-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customparsersettings.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customwizardmetafactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-customwizardmetafactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-defaultdeployconfigurationfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-defaultdeployconfigurationfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-deployconfigurationmodel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-deployconfigurationmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-desktopdeviceconfigurationwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-glob-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-glob.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-headerpath-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-headerpath.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-iconlistfield-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-iconlistfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-allprojectsfilter.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-appoutputpane-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-appoutputpane-runcontroltab-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-appoutputpane-runcontroltab.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-appoutputpane.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-buildsettingswidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-buildsteplistwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-buildstepspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-buildstepswidgetdata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-buildstepswidgetdata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-clangtoolchainconfigwidget-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-clangtoolchainconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-clangtoolchainfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-clangtoolchainfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-codestylesettingswidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-compileoutputwindow.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-copytaskhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-currentprojectfilter.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-currentprojectfind-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-currentprojectfind.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customparserconfigdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customtoolchainconfigwidget-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customtoolchainconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customtoolchainfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardcontext-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardcontext.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfield-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-lineeditdata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-lineeditdata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-pathchooserdata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-pathchooserdata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-texteditdata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage-texteditdata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfieldpage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfile-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardfile.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardpage-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardpage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardparameters-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardparameters.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardvalidationrule-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-customwizardvalidationrule.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-dependenciesmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-dependenciesview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-dependencieswidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-desktopdevicefactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-devicefactoryselectiondialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-deviceinformationconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-devicesettingspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-devicesettingswidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-devicetestdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-devicetypeinformationconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-editorsettingswidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-expanddata-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-expanddata.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-extraabi-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-extraabi.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-fieldpagefactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-fieldpagefactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-filegeneratorfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-filegeneratorfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-filepagefactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-filepagefactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-foldernavigationwidgetfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-gcctoolchainconfigwidget-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-gcctoolchainconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-gcctoolchainfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-gcctoolchainfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-generatorscriptargument-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-generatorscriptargument.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-genericlistwidget-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-genericlistwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-importwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitareawidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitenvironmentconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitfeatureprovider-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitfeatureprovider.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitmanagerconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitspagefactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-kitspagefactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-linuxicctoolchainfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-linuxicctoolchainfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-listwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-localprocesslist.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-mingwtoolchainfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-mingwtoolchainfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-miniprojecttargetselector.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-processstep-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-processstep.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-processstepconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-processstepfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-processstepfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectexplorersettings-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectexplorersettings.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectexplorersettingspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectlistwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectmodel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectpagefactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectpagefactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectwelcomepage-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectwelcomepage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectwindow.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-projectwizardpage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-removetaskhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-runsettingswidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-scannergeneratorfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-scannergeneratorfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sessiondialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sessionmodel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sessionmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sessionnameinputdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sessionview-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sessionview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-showineditortaskhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-showoutputtaskhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sshsettingspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sub-qt-creator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-summarypagefactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-summarypagefactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-sysrootinformationconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-targetgroupitem.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-targetsetupwidget-buildinfostore-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-targetsetupwidget-buildinfostore.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-targetsetupwidget-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-targetsetupwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-taskwindow.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-toolchaininformationconfigwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-toolchainoptionspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-toolchainsettingsaccessor-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-toolchainsettingsaccessor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-toolwidget.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-userfileaccessor-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-userfileaccessor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-vcsannotatetaskhandler.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-waitforstopdialog.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-internal-windebuginterface.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-journaldwatcher.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonfieldpage-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonfieldpage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonfilepage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonprojectpage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonsummarypage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonwizardgenerator-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonwizardgenerator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonwizardgeneratorfactory-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-jsonwizardgeneratorfactory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-kitguard-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-kitguard.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-labelfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-ldparser.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-lineeditfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-linuxiccparser.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-listfield-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-listfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-pathchooserfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-projectconfigurationmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-runconfigurationmodel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-runconfigurationmodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-selectablefilesdialogadddirectory.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-spacerfield-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-spacerfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-sub-qt-creator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-texteditfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-tree-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-tree.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/pyfield.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/pytype-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/pytype-templateargument.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/pytype.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/pyvalue.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmlerror-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmlerror.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-ast-sourcelocation-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-ast-sourcelocation.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-converttonumber-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-converttonumber.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-converttoobject-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-converttoobject.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-converttostring-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-converttostring.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-cplusplus-alreadyconsideredclasscontainer-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-cplusplus-alreadyconsideredclasscontainer.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-cplusplus-internal-fullyqualifiedname-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-cplusplus-internal-fullyqualifiedname.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-plugindumper-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-plugindumper-plugin-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-plugindumper-plugin.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-plugindumper.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-propertyinfo-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-propertyinfo.html
%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror-members.html
%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-ast-sourcelocation-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-ast-sourcelocation.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttonumber-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttonumber.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttoobject-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttoobject.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttostring-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttostring.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-propertyinfo-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-propertyinfo.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-std-hash-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-std-hash.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qt-creator.index
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qtcreator-api.html
@ -649,121 +280,53 @@ libexec/qtcreator/sdktool
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qtcreator-documentation.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qtcreator-ui-text.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qtcreatorcdbext.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qtinfo-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qtinfo.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/referencesymbolgroupnode-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/referencesymbolgroupnode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/register.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/snippets.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/stackframe.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/style/offline-simple.css
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/style/offline.css
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroup-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/styleanimator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/substringpredicate.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolancestorinfo.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroup.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupnode-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupnode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupnodevisitor-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupnodevisitor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupvalue-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupvalue.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupvaluecontext-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/symbolgroupvaluecontext.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-basicsmallstring-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-behaviorsettingspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-blockrange.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-codeassistant.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-colorscheme.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-displaysettingspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-highlighter.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-highlightersettings.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-highlightersettingspage.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-indenter.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-replacement.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-snippetssettings.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-textdocumentmanipulator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor-textstyles.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/texteditor.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/thread.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/transition.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-basicsmallstring.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-basicsmallstringliteral-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-basicsmallstringliteral.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-basicsmallstringvector-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-basicsmallstringvector.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-consoleprocessprivate-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-consoleprocessprivate.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-elfprogramheader-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-elfprogramheader.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-elfsectionheader-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-elfsectionheader.html
%%CLANG%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-eventcode-members.html
%%CLANG%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-eventcode.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-executeondestruction-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-executeondestruction.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-functiontakesargument.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-functiontraits-argument-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-functiontraits-argument.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-functiontraits-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-functiontraits.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-allocatedlayout-data-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-allocatedlayout-data.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-allocatedlayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-allocatedlayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-bestitemtype.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-colortip-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-colortip.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-dummyreduce-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-dummyreduce.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mapreduce-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mapreduce.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mapreducebase-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mapreducebase.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeallglobpatterns-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeallglobpatterns.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimedatabase.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimedatabaseprivate-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimedatabaseprivate.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeglobmatchresult-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeglobmatchresult.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeglobpattern-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeglobpattern.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeglobpatternlist-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeglobpatternlist.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimemagicrulematcher-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimemagicrulematcher.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeproviderbase-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimeproviderbase.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimetypeparser-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimetypeparser.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimetypeparserbase-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimetypeparserbase.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimetypeprivate-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimetypeprivate.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimexmlprovider-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-mimexmlprovider.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-reducewrapper-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-reducewrapper.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-referencelayout-data-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-referencelayout-data.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-referencelayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-referencelayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-resulttype.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-resulttypewithargument.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-shortstringlayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-shortstringlayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-smallstringiterator-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-smallstringiterator.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-statewrapper-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-statewrapper.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-stringdatalayout-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-stringdatalayout.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-texttip-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-texttip.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-tiplabel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-tiplabel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-widgettip-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-widgettip.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-linecolumn-members.html
%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-asyncjob-members.html
%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-internal-asyncjob.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-linecolumn.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-link-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-link.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-scopedswap-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-scopedswap.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-sizedarray-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-sizedarray.html
%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview-members.html
%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-treemodel-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-treemodel.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-typedtreeitem-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-typedtreeitem.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-view-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-view.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/vcsbase.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/watchessymbolgroup-members.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/watchessymbolgroup.html
%%PORTDOCS%%%%DOCSDIR%%/qtcreator.qch
%%PORTDOCS%%%%DOCSDIR%%/qtcreator/adding-plugins.html

View File

@ -0,0 +1,16 @@
Fix build with Qt5 5.13, which defined GLsizeiptr already.
Obtained from:
https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg436220.html
--- include/VBox/VBoxGL2D.h.orig 2019-09-29 14:31:16 UTC
+++ include/VBox/VBoxGL2D.h
@@ -107,7 +107,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint
typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
/* GL_ARB_pixel_buffer_object*/
-#ifndef Q_WS_MAC
+#if 0
/* apears to be defined on mac */
typedef ptrdiff_t GLsizeiptr;
#endif

View File

@ -28,4 +28,7 @@ CRAFTY_RUN_DEPENDS= crafty:games/crafty
STOCKFISH_DESC= Install Stockfish Chess Engine
STOCKFISH_RUN_DEPENDS= stockfish:games/stockfish
post-configure:
( cd ${BUILD_WRKSRC} && ${LRELEASE} ${WRKSRC}/${PORTNAME}.pro )
.include <bsd.port.mk>

View File

@ -0,0 +1,16 @@
--- src/pentobi/RatingDialog.cpp.orig 2019-09-01 15:41:49 UTC
+++ src/pentobi/RatingDialog.cpp
@@ -56,11 +56,11 @@ RatingDialog::RatingDialog(QWidget* parent, RatingHist
formLayout->addRow(tr("Rated games:"), m_labelNuGames);
m_labelBestRating = createSelectableLabel();
formLayout->addRow(tr("Best previous rating:"), m_labelBestRating);
- layout->addSpacing(layout->margin());
+ layout->addSpacing(layout->spacing());
layout->addWidget(new QLabel(tr("Recent development:")));
m_graph = new RatingGraph;
layout->addWidget(m_graph, 1);
- layout->addSpacing(layout->margin());
+ layout->addSpacing(layout->spacing());
layout->addWidget(new QLabel(tr("Recent games:")));
m_list = new RatedGamesList;
layout->addWidget(m_list, 1);

View File

@ -20,7 +20,7 @@ USE_QT= buildtools linguist_build core gui printsupport widgets
PLIST_FILES= bin/diffpdf
pre-configure:
${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
( cd ${BUILD_WRKSRC} && ${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro )
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/diffpdf ${STAGEDIR}${PREFIX}/bin/

View File

@ -0,0 +1,19 @@
--- src/colorschemeinterface.cc.orig 2019-09-01 12:18:45 UTC
+++ src/colorschemeinterface.cc
@@ -24,6 +24,7 @@
#include <string.h>
+#include <algorithm>
QList<ColorSchemeInterface*>* ColorSchemeInterface::ColorSchemeList = nullptr;
bool ColorSchemeInterface::Updated = false;
@@ -69,7 +70,7 @@ static bool lessThan(const ColorSchemeInterface* c1,
ColorSchemeInterface* ColorSchemeInterface::getColorScheme(const unsigned int index)
{
if(Updated) {
- qSort(ColorSchemeList->begin(), ColorSchemeList->end(), lessThan);
+ std::sort(ColorSchemeList->begin(), ColorSchemeList->end(), lessThan);
Updated = false;
}
return(ColorSchemeList->value(index, nullptr));

View File

@ -0,0 +1,19 @@
--- src/fractalalgorithminterface.cc.orig 2019-09-01 12:19:42 UTC
+++ src/fractalalgorithminterface.cc
@@ -23,6 +23,7 @@
#include "fractalalgorithminterface.h"
#include "uintconfigentry.h"
+#include <algorithm>
QList<FractalAlgorithmInterface*>* FractalAlgorithmInterface::AlgorithmList = nullptr;
bool FractalAlgorithmInterface::Updated = false;
@@ -100,7 +101,7 @@ static bool lessThan(const FractalAlgorithmInterface*
FractalAlgorithmInterface* FractalAlgorithmInterface::getAlgorithm(const unsigned int index)
{
if(Updated) {
- qSort(AlgorithmList->begin(), AlgorithmList->end(), lessThan);
+ std::sort(AlgorithmList->begin(), AlgorithmList->end(), lessThan);
Updated = false;
}
return(AlgorithmList->value(index, nullptr));

View File

@ -33,7 +33,7 @@ TIFF_DESC= Support for GeoTIFF images
TIFF_USE= QT=imageformats_run
pre-build-NLS-on:
${LRELEASE} ${WRKSRC}/${PORTNAME}.pro
( cd ${BUILD_WRKSRC} && ${LRELEASE} ${WRKSRC}/${PORTNAME}.pro )
do-install:
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gpxsee ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

View File

@ -725,6 +725,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderermanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glbuffer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glcommands_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexturemanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltfskeletonloader_p.h
@ -850,6 +851,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneimportplugin_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneloader_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qscissortest_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsetfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderdata_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogram_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogrambuilder_p.h
@ -869,6 +871,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtextureimagedata_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qurlhelper_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qviewport_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qwaitfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycaster_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycastingjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderbuffer_p.h
@ -900,6 +903,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/segmentsvisitor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendbuffercapturejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendrendercapturejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/setfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shader_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderbuilder_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadercache_p.h
@ -921,11 +925,13 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturedatamanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/textureimage_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturesubmissioncontext_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/transform_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/triangleboundingvolume_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesvisitor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/uniform_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateentityhierarchyjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateentitylayersjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatelevelofdetailjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatemeshtrianglelistjob_p.h
@ -937,6 +943,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/viewportnode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/visitorutils_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vsyncframeadvanceservice_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/waitfence_p.h
%%QT_INCDIR%%/Qt3DRender/FunctorType
%%QT_INCDIR%%/Qt3DRender/ParameterList
%%QT_INCDIR%%/Qt3DRender/PropertyReaderInterface
@ -1029,6 +1036,7 @@
%%QT_INCDIR%%/Qt3DRender/QScissorTest
%%QT_INCDIR%%/Qt3DRender/QScreenRayCaster
%%QT_INCDIR%%/Qt3DRender/QSeamlessCubemap
%%QT_INCDIR%%/Qt3DRender/QSetFence
%%QT_INCDIR%%/Qt3DRender/QShaderData
%%QT_INCDIR%%/Qt3DRender/QShaderProgram
%%QT_INCDIR%%/Qt3DRender/QShaderProgramBuilder
@ -1053,6 +1061,7 @@
%%QT_INCDIR%%/Qt3DRender/QTextureImageDataPtr
%%QT_INCDIR%%/Qt3DRender/QTextureWrapMode
%%QT_INCDIR%%/Qt3DRender/QViewport
%%QT_INCDIR%%/Qt3DRender/QWaitFence
%%QT_INCDIR%%/Qt3DRender/Qt3DRender
%%QT_INCDIR%%/Qt3DRender/Qt3DRenderDepends
%%QT_INCDIR%%/Qt3DRender/Qt3DRenderVersion
@ -1134,6 +1143,7 @@
%%QT_INCDIR%%/Qt3DRender/qscissortest.h
%%QT_INCDIR%%/Qt3DRender/qscreenraycaster.h
%%QT_INCDIR%%/Qt3DRender/qseamlesscubemap.h
%%QT_INCDIR%%/Qt3DRender/qsetfence.h
%%QT_INCDIR%%/Qt3DRender/qshaderdata.h
%%QT_INCDIR%%/Qt3DRender/qshaderprogram.h
%%QT_INCDIR%%/Qt3DRender/qshaderprogrambuilder.h
@ -1157,6 +1167,7 @@
%%QT_INCDIR%%/Qt3DRender/qtextureimagedatagenerator.h
%%QT_INCDIR%%/Qt3DRender/qtexturewrapmode.h
%%QT_INCDIR%%/Qt3DRender/qviewport.h
%%QT_INCDIR%%/Qt3DRender/qwaitfence.h
%%QT_CMAKEDIR%%/Qt53DAnimation/Qt53DAnimationConfig.cmake
%%QT_CMAKEDIR%%/Qt53DAnimation/Qt53DAnimationConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt53DCore/Qt53DCoreConfig.cmake

View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:28:15 UTC
--- src/src.pro.orig 2019-02-14 20:02:42 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs

View File

@ -75,9 +75,11 @@
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-ivi-application.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-key-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-windowmanager.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-scaler.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-touch-extension.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-viewporter.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-decoration-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5_p.h
@ -105,7 +107,10 @@
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinput_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanager_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtouch_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandutils_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandview_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandviewporter_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlscaler_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshell_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshellintegration_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgdecorationv1_p.h
@ -138,9 +143,11 @@
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-ivi-application-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-key-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-windowmanager-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-scaler-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-server-buffer-extension-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v2-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-touch-extension-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-viewporter-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-decoration-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-server-protocol.h
@ -182,6 +189,8 @@
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputManager
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTouch
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandView
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandViewporter
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlScaler
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShell
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShellSurface
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgDecorationManagerV1
@ -235,6 +244,8 @@
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputmanager.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtouch.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandview.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandviewporter.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandwlscaler.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandwlshell.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgdecorationv1.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshell.h
@ -250,6 +261,7 @@
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_DrmEglServerBufferPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandBradientDecorationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandEglClientBufferPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandFullScreenShellV1IntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandIviShellIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandWlShellIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeEglClientBufferPlugin.cmake
@ -262,6 +274,7 @@
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DmaBufServerBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DrmEglServerBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandDmabufClientBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglClientBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglStreamBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake
@ -310,6 +323,8 @@
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so
@ -320,6 +335,8 @@
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug
%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so.debug
%%QT_PLUGINDIR%%/wayland-shell-integration/libwl-shell.so

View File

@ -1,9 +1,10 @@
--- rkward/windows/rkworkplace.cpp.orig 2019-09-04 19:06:32 UTC
--- rkward/windows/rkworkplace.cpp.orig 2019-09-04 10:11:21 UTC
+++ rkward/windows/rkworkplace.cpp
@@ -31,6 +31,7 @@
@@ -31,6 +31,8 @@
#include <QDir>
#include <QApplication>
#include <QMimeDatabase>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
#include "detachedwindowcontainer.h"

View File

@ -1,6 +1,13 @@
# Created by: Marie Loise Nolden <loise@kde.org>
# $FreeBSD$
# Lock the port at 5.12.2 due to distfile changes: At the moment it seems like
# the documentation is no longer availble as a single tarball. So while we try
# to figure out whether to create a per-module -doc port or some other nastiness
# hold this port back at the last single-file version available.
# If you need up-to-date Qt Documentation, for now, use the the online one :)
QT5_VERSION= 5.12.2
PORTNAME= doc
DISTVERSION= ${QT5_VERSION}
CATEGORIES= misc

View File

@ -27,11 +27,14 @@ EXAMPLESDIR= ${PREFIX}/share/examples/qt5
# qtscript and qtserialbus where the examples are looked up in $EXAMPLESDIR/.
# This way, the examples show up in qtcreator on the examples front page.
EXAMPLES= qt3d qtbase qtcanvas3d qtcharts qtconnectivity qtdeclarative \
qtgamepad qtlocation qtmultimedia qtpurchasing qtquickcontrols \
qtquickcontrols2 qtscript qtscxml qtsensors qtserialbus \
qtserialport qtsvg qttools qtvirtualkeyboard qtwebchannel \
qtwebsockets qtxmlpatterns
_QT_DISTS= 3d activeqt androidextras base charts connectivity datavis3d \
declarative doc gamepad location \
macextras multimedia networkauth purchasing quickcontrols \
quickcontrols2 remoteobjects script scxml sensors serialbus \
serialport speech svg tools virtualkeyboard wayland \
webchannel webengine websockets webview winextras \
xmlpatterns
EXAMPLES= ${_QT_DISTS:C/^/qt/}
.for example in ${EXAMPLES}
EXTRACT_AFTER_ARGS+= ${DISTNAME}/${example}/examples

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1552888933
SHA256 (KDE/Qt/5.12.2/qt-everywhere-src-5.12.2.tar.xz) = 59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5
SIZE (KDE/Qt/5.12.2/qt-everywhere-src-5.12.2.tar.xz) = 507757480
TIMESTAMP = 1561317057
SHA256 (KDE/Qt/5.13.0/qt-everywhere-src-5.13.0.tar.xz) = 2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6
SIZE (KDE/Qt/5.13.0/qt-everywhere-src-5.13.0.tar.xz) = 504491324

File diff suppressed because it is too large Load Diff

View File

@ -123,6 +123,7 @@
%%QT_L10NDIR%%/qtbase_ru.qm
%%QT_L10NDIR%%/qtbase_sk.qm
%%QT_L10NDIR%%/qtbase_uk.qm
%%QT_L10NDIR%%/qtbase_zh_TW.qm
%%QT_L10NDIR%%/qtconnectivity_bg.qm
%%QT_L10NDIR%%/qtconnectivity_da.qm
%%QT_L10NDIR%%/qtconnectivity_de.qm
@ -178,14 +179,18 @@
%%QT_L10NDIR%%/qtmultimedia_ru.qm
%%QT_L10NDIR%%/qtmultimedia_sk.qm
%%QT_L10NDIR%%/qtmultimedia_uk.qm
%%QT_L10NDIR%%/qtmultimedia_zh_TW.qm
%%QT_L10NDIR%%/qtquickcontrols2_ar.qm
%%QT_L10NDIR%%/qtquickcontrols2_bg.qm
%%QT_L10NDIR%%/qtquickcontrols2_ca.qm
%%QT_L10NDIR%%/qtquickcontrols2_da.qm
%%QT_L10NDIR%%/qtquickcontrols2_en.qm
%%QT_L10NDIR%%/qtquickcontrols2_hu.qm
%%QT_L10NDIR%%/qtquickcontrols2_ko.qm
%%QT_L10NDIR%%/qtquickcontrols2_uk.qm
%%QT_L10NDIR%%/qtquickcontrols2_zh_TW.qm
%%QT_L10NDIR%%/qtquickcontrols_bg.qm
%%QT_L10NDIR%%/qtquickcontrols_ca.qm
%%QT_L10NDIR%%/qtquickcontrols_da.qm
%%QT_L10NDIR%%/qtquickcontrols_de.qm
%%QT_L10NDIR%%/qtquickcontrols_en.qm
@ -194,6 +199,7 @@
%%QT_L10NDIR%%/qtquickcontrols_ja.qm
%%QT_L10NDIR%%/qtquickcontrols_ru.qm
%%QT_L10NDIR%%/qtquickcontrols_uk.qm
%%QT_L10NDIR%%/qtquickcontrols_zh_TW.qm
%%QT_L10NDIR%%/qtscript_ar.qm
%%QT_L10NDIR%%/qtscript_bg.qm
%%QT_L10NDIR%%/qtscript_ca.qm
@ -254,3 +260,4 @@
%%QT_L10NDIR%%/qtxmlpatterns_ru.qm
%%QT_L10NDIR%%/qtxmlpatterns_sk.qm
%%QT_L10NDIR%%/qtxmlpatterns_uk.qm
%%QT_L10NDIR%%/qtxmlpatterns_zh_TW.qm

View File

@ -11,7 +11,7 @@ COMMENT= Qt audio, video, radio and camera support module
# LICENSE set via USES_QT5 (bsd.qt.mk)
USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
USES= compiler:c++11-lang gl gnome pkgconfig openal qmake:norecursive \
qt-dist:5,multimedia
USE_GL= gl
USE_GNOME= glib20
@ -48,8 +48,6 @@ GSTREAMER_VARS= QT_CONFIG+=gstreamer-1.0 \
QMAKE_CONFIGURE_ARGS+=-gstreamer 1.0
GSTREAMER_VARS_OFF= QT_CONFIG+=-gstreamer-1.0 \
QMAKE_CONFIGURE_ARGS+=-no-gstreamer
OPENAL_USES= openal
OPENAL_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-openal
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_VARS= QT_CONFIG+=pulseaudio
PULSEAUDIO_VARS_OFF= QT_CONFIG+=-pulseaudio \

View File

@ -1,11 +0,0 @@
Make it possible to disable OpenAL support via a command-line option.
--- src/multimedia/configure.json
+++ src/multimedia/configure.json
@@ -9,6 +9,7 @@
"options": {
"alsa": "boolean",
"gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] },
+ "openal": "boolean",
"pulseaudio": "boolean",
"mediaplayer-backend": { "type": "string", "values": [ "directshow", "wmf" ] },
"wmf-backend": { "type": "void", "name": "mediaplayer-backend", "value": "wmf" }

View File

@ -1,4 +1,3 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/gstvideoconnector_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qabstractvideobuffer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiobuffer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevicefactory_p.h
@ -7,29 +6,6 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_backend_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstappsrc_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstbufferpoolinterface_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstcodecsinfo_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreameraudioinputselector_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreameraudioprobecontrol_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerbufferprobe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerbushelper_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamermessage_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamermirtexturerenderer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerplayercontrol_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerplayersession_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideooverlay_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideoprobecontrol_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorenderer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorendererinterface_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideowidget_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideowindow_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgsttools_global_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstutils_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideobuffer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorendererplugin_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorenderersink_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h
@ -62,7 +38,6 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfacegstsink_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
@ -254,6 +229,31 @@
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/QtMultimediaGstToolsDepends
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/QtMultimediaGstToolsVersion
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/qtmultimediagsttoolsversion.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/gstvideoconnector_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstappsrc_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstbufferpoolinterface_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstcodecsinfo_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreameraudioinputselector_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreameraudioprobecontrol_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbufferprobe_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbushelper_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermessage_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermirtexturerenderer_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayercontrol_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayersession_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideoinputdevicecontrol_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideooverlay_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideoprobecontrol_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideorenderer_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideorendererinterface_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideowidget_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideowindow_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgsttools_global_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstutils_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideobuffer_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorendererplugin_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorenderersink_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qvideosurfacegstsink_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_rgb_p.h

View File

@ -0,0 +1,13 @@
diff --git src/widget/tool/callconfirmwidget.cpp src/widget/tool/callconfirmwidget.cpp
index 19db6b86..dbcb96fc 100644
--- src/widget/tool/callconfirmwidget.cpp
+++ src/widget/tool/callconfirmwidget.cpp
@@ -148,7 +148,7 @@ void CallConfirmWidget::paintEvent(QPaintEvent*)
painter.setBrush(brush);
painter.setPen(Qt::NoPen);
- painter.drawRoundRect(mainRect, roundedFactor * rectRatio, roundedFactor);
+ painter.drawRoundedRect(mainRect, roundedFactor * rectRatio, roundedFactor, Qt::RelativeSize);
painter.drawPolygon(spikePoly);
}

View File

@ -0,0 +1,17 @@
diff --git src/widget/form/settings/avform.cpp src/widget/form/settings/avform.cpp
index 9a306c2a..4c360143 100644
--- src/widget/form/settings/avform.cpp
+++ src/widget/form/settings/avform.cpp
@@ -105,9 +105,11 @@ AVForm::AVForm(IAudioControl& audio, CoreAV* coreAV, CameraSource& camera,
eventsInit();
QDesktopWidget* desktop = QApplication::desktop();
- connect(desktop, &QDesktopWidget::resized, this, &AVForm::rescanDevices);
connect(desktop, &QDesktopWidget::screenCountChanged, this, &AVForm::rescanDevices);
+ for (QScreen* qScreen : QGuiApplication::screens()) {
+ connect(qScreen, &QScreen::geometryChanged, this, &AVForm::rescanDevices);
+ }
Translator::registerHandler(std::bind(&AVForm::retranslateUi, this), this);
}

View File

@ -0,0 +1,13 @@
diff --git src/persistence/offlinemsgengine.cpp src/persistence/offlinemsgengine.cpp
index 0e7247b3..b1cff673 100644
--- src/persistence/offlinemsgengine.cpp
+++ src/persistence/offlinemsgengine.cpp
@@ -101,7 +101,7 @@ void OfflineMsgEngine::deliverOfflineMsgs()
QVector<OfflineMessage> messages = sentMessages.values().toVector() + unsentMessages;
// order messages by authorship time to resend in same order as they were written
- qSort(messages.begin(), messages.end(), [](const OfflineMessage& lhs, const OfflineMessage& rhs) {
+ std::sort(messages.begin(), messages.end(), [](const OfflineMessage& lhs, const OfflineMessage& rhs) {
return lhs.authorshipTime < rhs.authorshipTime;
});
removeAllMessages();

View File

@ -0,0 +1,12 @@
diff --git test/model/groupmessagedispatcher_test.cpp test/model/groupmessagedispatcher_test.cpp
index 30990d03..30591b37 100644
--- test/model/groupmessagedispatcher_test.cpp
+++ test/model/groupmessagedispatcher_test.cpp
@@ -26,6 +26,7 @@
#include <QObject>
#include <QtTest/QtTest>
+#include <set>
#include <deque>

View File

@ -0,0 +1,13 @@
diff --git src/widget/form/groupchatform.cpp src/widget/form/groupchatform.cpp
index 73411749..58e23b02 100644
--- src/widget/form/groupchatform.cpp
+++ src/widget/form/groupchatform.cpp
@@ -218,7 +218,7 @@ void GroupChatForm::updateUserNames()
// add the labels in alphabetical order into the layout
auto nickLabelList = peerLabels.values();
- qSort(nickLabelList.begin(), nickLabelList.end(), [](const QLabel* a, const QLabel* b)
+ std::sort(nickLabelList.begin(), nickLabelList.end(), [](const QLabel* a, const QLabel* b)
{
return a->text().toLower() < b->text().toLower();
});

View File

@ -0,0 +1,52 @@
diff --git src/chatlog/content/filetransferwidget.cpp src/chatlog/content/filetransferwidget.cpp
index bf79238e..87156de9 100644
--- src/chatlog/content/filetransferwidget.cpp
+++ src/chatlog/content/filetransferwidget.cpp
@@ -195,13 +195,14 @@ void FileTransferWidget::paintEvent(QPaintEvent*)
// Draw the widget background:
painter.setClipRect(QRect(0, 0, width(), height()));
painter.setBrush(QBrush(backgroundColor));
- painter.drawRoundRect(geometry(), r * ratio, r);
+ painter.drawRoundedRect(geometry(), r * ratio, r, Qt::RelativeSize);
if (drawButtonAreaNeeded()) {
// Draw the button background:
QPainterPath buttonBackground;
- buttonBackground.addRoundRect(width() - 2 * buttonFieldWidth - lineWidth * 2, 0,
- buttonFieldWidth, buttonFieldWidth + lineWidth, 50, 50);
+ buttonBackground.addRoundedRect(width() - 2 * buttonFieldWidth - lineWidth * 2, 0,
+ buttonFieldWidth, buttonFieldWidth + lineWidth, 50, 50,
+ Qt::RelativeSize);
buttonBackground.addRect(width() - 2 * buttonFieldWidth - lineWidth * 2, 0,
buttonFieldWidth * 2, buttonFieldWidth / 2);
buttonBackground.addRect(width() - 1.5 * buttonFieldWidth - lineWidth * 2, 0,
@@ -212,9 +213,9 @@ void FileTransferWidget::paintEvent(QPaintEvent*)
// Draw the left button:
QPainterPath leftButton;
- leftButton.addRoundRect(QRect(width() - 2 * buttonFieldWidth - lineWidth, 0,
+ leftButton.addRoundedRect(QRect(width() - 2 * buttonFieldWidth - lineWidth, 0,
buttonFieldWidth, buttonFieldWidth),
- 50, 50);
+ 50, 50, Qt::RelativeSize);
leftButton.addRect(QRect(width() - 2 * buttonFieldWidth - lineWidth, 0,
buttonFieldWidth / 2, buttonFieldWidth / 2));
leftButton.addRect(QRect(width() - 1.5 * buttonFieldWidth - lineWidth, 0,
@@ -226,7 +227,7 @@ void FileTransferWidget::paintEvent(QPaintEvent*)
// Draw the right button:
painter.setBrush(QBrush(buttonColor));
painter.setClipRect(QRect(width() - buttonFieldWidth, 0, buttonFieldWidth, buttonFieldWidth));
- painter.drawRoundRect(geometry(), r * ratio, r);
+ painter.drawRoundedRect(geometry(), r * ratio, r, Qt::RelativeSize);
}
}
@@ -539,7 +540,7 @@ void FileTransferWidget::showPreview(const QString& filename)
ui->previewButton->show();
// Show mouseover preview, but make sure it's not larger than 50% of the screen
// width/height
- const QRect desktopSize = QApplication::desktop()->screenGeometry();
+ const QRect desktopSize = QApplication::desktop()->geometry();
const int maxPreviewWidth{desktopSize.width() / 2};
const int maxPreviewHeight{desktopSize.height() / 2};
const QImage previewImage = [&image, maxPreviewWidth, maxPreviewHeight]() {

View File

@ -0,0 +1,38 @@
diff --git src/widget/tool/croppinglabel.cpp src/widget/tool/croppinglabel.cpp
index 0b12840a..d4364361 100644
--- src/widget/tool/croppinglabel.cpp
+++ src/widget/tool/croppinglabel.cpp
@@ -36,8 +36,7 @@ CroppingLabel::CroppingLabel(QWidget* parent)
public:
explicit LineEdit(QWidget* parent = nullptr)
: QLineEdit(parent)
- {
- }
+ {}
protected:
void keyPressEvent(QKeyEvent* event) override
@@ -106,7 +105,11 @@ QSize CroppingLabel::sizeHint() const
QSize CroppingLabel::minimumSizeHint() const
{
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+ return QSize(fontMetrics().horizontalAdvance("..."), QLabel::minimumSizeHint().height());
+#else
return QSize(fontMetrics().width("..."), QLabel::minimumSizeHint().height());
+#endif
}
void CroppingLabel::mouseReleaseEvent(QMouseEvent* e)
@@ -171,7 +174,11 @@ void CroppingLabel::minimizeMaximumWidth()
{
// This function chooses the smallest possible maximum width.
// Text width + padding. Without padding, we'll have elipses.
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+ setMaximumWidth(fontMetrics().horizontalAdvance(origText) + fontMetrics().horizontalAdvance("..."));
+#else
setMaximumWidth(fontMetrics().width(origText) + fontMetrics().width("..."));
+#endif
}
void CroppingLabel::editingFinished()

View File

@ -0,0 +1,29 @@
diff --git src/widget/contentdialog.cpp src/widget/contentdialog.cpp
index 2476390d..da34e9e3 100644
--- src/widget/contentdialog.cpp
+++ src/widget/contentdialog.cpp
@@ -69,7 +69,11 @@ ContentDialog::ContentDialog(QWidget* parent)
friendLayout->getLayoutOffline()};
if (s.getGroupchatPosition()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
+ layouts.swapItemsAt(0, 1);
+#else
layouts.swap(0, 1);
+#endif
}
QWidget* friendWidget = new QWidget();
@@ -399,7 +403,12 @@ void ContentDialog::reorderLayouts(bool newGroupOnTop)
{
bool oldGroupOnTop = layouts.first() == groupLayout.getLayout();
if (newGroupOnTop != oldGroupOnTop) {
+ // Kriby: Maintain backwards compatibility
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
+ layouts.swapItemsAt(0, 1);
+#else
layouts.swap(0, 1);
+#endif
}
}

View File

@ -0,0 +1,30 @@
diff --git src/widget/systemtrayicon.cpp src/widget/systemtrayicon.cpp
index d89236cc..623f32cd 100644
--- src/widget/systemtrayicon.cpp
+++ src/widget/systemtrayicon.cpp
@@ -115,9 +115,13 @@ GdkPixbuf* SystemTrayIcon::convertQIconToPixbuf(const QIcon& icon)
QImage image = icon.pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+ guchar* image_bytes = new guchar[image.sizeInBytes()];
+ memcpy(image_bytes, image.bits(), image.sizeInBytes());
+#else
guchar* image_bytes = new guchar[image.byteCount()];
memcpy(image_bytes, image.bits(), image.byteCount());
-
+#endif
return gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(), 8,
image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, nullptr);
@@ -214,8 +218,8 @@ void SystemTrayIcon::setContextMenu(QMenu* menu)
else if (a->icon().isNull())
item = gtk_menu_item_new_with_label(aText.c_str());
else {
- const std::string iconPath = extractIconToFile(a->icon(),
- "iconmenu" + a->icon().name()).toStdString();
+ const std::string iconPath =
+ extractIconToFile(a->icon(), "iconmenu" + a->icon().name()).toStdString();
GtkWidget* image = gtk_image_new_from_file(iconPath.c_str());
item = gtk_image_menu_item_new_with_label(aText.c_str());
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);

View File

@ -0,0 +1,43 @@
diff --git src/video/genericnetcamview.cpp src/video/genericnetcamview.cpp
index 7398cc47..36012b20 100644
--- src/video/genericnetcamview.cpp
+++ src/video/genericnetcamview.cpp
@@ -20,6 +20,7 @@
#include "genericnetcamview.h"
#include <QApplication>
+#include <QScreen>
#include <QBoxLayout>
#include <QDesktopWidget>
#include <QKeyEvent>
@@ -136,8 +137,11 @@ void GenericNetCamView::enterFullScreen()
showFullScreen();
enterFullScreenButton->hide();
toggleMessagesButton->hide();
-
- const auto screenSize = QApplication::desktop()->screenGeometry(this);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+ const auto screenSize = QGuiApplication::screenAt(this->pos())->geometry();
+#else
+ const QRect screenSize = QApplication::desktop()->screenGeometry(this);
+#endif
buttonPanel->setGeometry((screenSize.width() / 2) - buttonPanel->width() / 2,
screenSize.height() - BTN_PANEL_HEIGHT - 25, BTN_PANEL_WIDTH, BTN_PANEL_HEIGHT);
buttonPanel->show();
diff --git src/widget/tool/screenshotgrabber.cpp src/widget/tool/screenshotgrabber.cpp
index 7ea91f6b..0863393f 100644
--- src/widget/tool/screenshotgrabber.cpp
+++ src/widget/tool/screenshotgrabber.cpp
@@ -203,7 +203,11 @@ void ScreenshotGrabber::chooseHelperTooltipText(QRect rect)
void ScreenshotGrabber::adjustTooltipPosition()
{
QRect recGL = QGuiApplication::primaryScreen()->virtualGeometry();
- QRect rec = qApp->desktop()->screenGeometry(QCursor::pos());
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+ const auto rec = QGuiApplication::screenAt(QCursor::pos())->geometry();
+#else
+ const auto rec = qApp->desktop()->screenGeometry(QCursor::pos());
+#endif
const QRectF ttRect = this->helperToolbox->childrenBoundingRect();
int x = qAbs(recGL.x()) + rec.x() + ((rec.width() - ttRect.width()) / 2);
int y = qAbs(recGL.y()) + rec.y();

View File

@ -0,0 +1,44 @@
diff --git src/widget/form/settings/avform.cpp src/widget/form/settings/avform.cpp
index 4c360143..e939f6ab 100644
--- src/widget/form/settings/avform.cpp
+++ src/widget/form/settings/avform.cpp
@@ -105,11 +105,14 @@ AVForm::AVForm(IAudioControl& audio, CoreAV* coreAV, CameraSource& camera,
eventsInit();
QDesktopWidget* desktop = QApplication::desktop();
- connect(desktop, &QDesktopWidget::screenCountChanged, this, &AVForm::rescanDevices);
-
for (QScreen* qScreen : QGuiApplication::screens()) {
connect(qScreen, &QScreen::geometryChanged, this, &AVForm::rescanDevices);
}
+ auto* qGUIApp = qobject_cast<QGuiApplication *>(qApp);
+ assert (qGUIApp);
+ connect(qGUIApp, &QGuiApplication::screenAdded, this, &AVForm::trackNewScreenGeometry);
+ connect(qGUIApp, &QGuiApplication::screenAdded, this, &AVForm::rescanDevices);
+ connect(qGUIApp, &QGuiApplication::screenRemoved, this, &AVForm::rescanDevices);
Translator::registerHandler(std::bind(&AVForm::retranslateUi, this), this);
}
@@ -160,6 +163,10 @@ void AVForm::open(const QString& devName, const VideoMode& mode)
camera.setupDevice(devName, mode);
}
+void AVForm::trackNewScreenGeometry(QScreen* qScreen) {
+ connect(qScreen, &QScreen::geometryChanged, this, &AVForm::rescanDevices);
+}
+
void AVForm::rescanDevices()
{
getAudioInDevices();
diff --git src/widget/form/settings/avform.h src/widget/form/settings/avform.h
index 5ff4ad6f..becaa74c 100644
--- src/widget/form/settings/avform.h
+++ src/widget/form/settings/avform.h
@@ -95,6 +95,7 @@ private:
void open(const QString& devName, const VideoMode& mode);
int getStepsFromValue(qreal val, qreal valMin, qreal valMax);
qreal getValueFromSteps(int steps, qreal valMin, qreal valMax);
+ void trackNewScreenGeometry(QScreen* qScreen);
private:
IAudioControl& audio;

View File

@ -2,7 +2,6 @@
PORTNAME= network
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= net ipv6
PKGNAMEPREFIX= qt5-

View File

@ -1,109 +0,0 @@
QDnsLookup: fix "Resolver functions not found" error on FreeBSD
The current code only tries to load the required functions from
LIBRESOLV_SO (if defined) and resolv, but on FreeBSD they are in libc:
https://www.freebsd.org/cgi/man.cgi?query=res_query&sektion=3&apropos=0&manpath=freebsd
This commit changes the code so that, after failing to load the
non-existent libraries, it attempts to load the functions with dlsym()
using the special handle RTLD_DEFAULT, which searches for the specified
symbol in the loaded libraries.
Task-number: QTBUG-74844
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 11b80d59d5e..d7a92a12ebe 100644
--- src/network/kernel/kernel.pri
+++ src/network/kernel/kernel.pri
@@ -38,7 +38,11 @@ qtConfig(dnslookup) {
}
unix {
- !integrity:qtConfig(dnslookup): SOURCES += kernel/qdnslookup_unix.cpp
+ !integrity:qtConfig(dnslookup) {
+ SOURCES += kernel/qdnslookup_unix.cpp
+ qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl
+ }
+
SOURCES += kernel/qhostinfo_unix.cpp
qtConfig(linux-netlink): SOURCES += kernel/qnetworkinterface_linux.cpp
diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp
index ce1ec6442a6..ee7484ab35f 100644
--- src/network/kernel/qdnslookup_unix.cpp
+++ src/network/kernel/qdnslookup_unix.cpp
@@ -59,6 +59,10 @@
# include <gnu/lib-names.h>
#endif
+#if defined(Q_OS_FREEBSD) || QT_CONFIG(dlopen)
+# include <dlfcn.h>
+#endif
+
#include <cstring>
QT_BEGIN_NAMESPACE
@@ -87,6 +91,18 @@ struct QDnsLookupStateDeleter
}
};
+static QFunctionPointer resolveSymbol(QLibrary &lib, const char *sym)
+{
+ if (lib.isLoaded())
+ return lib.resolve(sym);
+
+#if defined(RTLD_DEFAULT) && (defined(Q_OS_FREEBSD) || QT_CONFIG(dlopen))
+ return reinterpret_cast<QFunctionPointer>(dlsym(RTLD_DEFAULT, sym));
+#else
+ return nullptr;
+#endif
+}
+
static bool resolveLibraryInternal()
{
QLibrary lib;
@@ -96,31 +112,30 @@ static bool resolveLibraryInternal()
#endif
{
lib.setFileName(QLatin1String("resolv"));
- if (!lib.load())
- return false;
+ lib.load();
}
- local_dn_expand = dn_expand_proto(lib.resolve("__dn_expand"));
+ local_dn_expand = dn_expand_proto(resolveSymbol(lib, "__dn_expand"));
if (!local_dn_expand)
- local_dn_expand = dn_expand_proto(lib.resolve("dn_expand"));
+ local_dn_expand = dn_expand_proto(resolveSymbol(lib, "dn_expand"));
- local_res_nclose = res_nclose_proto(lib.resolve("__res_nclose"));
+ local_res_nclose = res_nclose_proto(resolveSymbol(lib, "__res_nclose"));
if (!local_res_nclose)
- local_res_nclose = res_nclose_proto(lib.resolve("res_9_nclose"));
+ local_res_nclose = res_nclose_proto(resolveSymbol(lib, "res_9_nclose"));
if (!local_res_nclose)
- local_res_nclose = res_nclose_proto(lib.resolve("res_nclose"));
+ local_res_nclose = res_nclose_proto(resolveSymbol(lib, "res_nclose"));
- local_res_ninit = res_ninit_proto(lib.resolve("__res_ninit"));
+ local_res_ninit = res_ninit_proto(resolveSymbol(lib, "__res_ninit"));
if (!local_res_ninit)
- local_res_ninit = res_ninit_proto(lib.resolve("res_9_ninit"));
+ local_res_ninit = res_ninit_proto(resolveSymbol(lib, "res_9_ninit"));
if (!local_res_ninit)
- local_res_ninit = res_ninit_proto(lib.resolve("res_ninit"));
+ local_res_ninit = res_ninit_proto(resolveSymbol(lib, "res_ninit"));
- local_res_nquery = res_nquery_proto(lib.resolve("__res_nquery"));
+ local_res_nquery = res_nquery_proto(resolveSymbol(lib, "__res_nquery"));
if (!local_res_nquery)
- local_res_nquery = res_nquery_proto(lib.resolve("res_9_nquery"));
+ local_res_nquery = res_nquery_proto(resolveSymbol(lib, "res_9_nquery"));
if (!local_res_nquery)
- local_res_nquery = res_nquery_proto(lib.resolve("res_nquery"));
+ local_res_nquery = res_nquery_proto(resolveSymbol(lib, "res_nquery"));
return true;
}

View File

@ -1,15 +0,0 @@
*
* Fix for libressl after openssl111 API change
*
*
--- src/network/ssl/qsslcontext_openssl.cpp.orig 2018-12-03 11:15:26 UTC
+++ src/network/ssl/qsslcontext_openssl.cpp
@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSs
if (sslContext->sslConfiguration.backendConfiguration().isEmpty())
return;
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {

View File

@ -1,71 +0,0 @@
For LibreSSL, redefine OPENSSL_STACK to use the native stack_st.
Also redefine DSA_bits() to a LibreSSL-native routine.
Redefine SSL stack functions to their proper symbols in LibreSSL.
--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig 2018-12-03 11:15:26 UTC
+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
@@ -75,21 +75,49 @@
#error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead"
#endif
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
+// From the signature in LibreSSL
+#define OPENSSL_INIT_SETTINGS void
+// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
+#endif
+
const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
+#else
int q_DSA_bits(DSA *a);
+#endif
int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
int q_EVP_PKEY_base_id(EVP_PKEY *a);
int q_RSA_bits(RSA *a);
+#ifdef LIBRESSL_VERSION_NUMBER
+int q_sk_num(OPENSSL_STACK *a);
+void q_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+OPENSSL_STACK *q_sk_new_null();
+void q_sk_push(OPENSSL_STACK *st, void *data);
+void q_sk_free(OPENSSL_STACK *a);
+void * q_sk_value(OPENSSL_STACK *a, int b);
+#define q_OPENSSL_sk_num(a) q_sk_num(a)
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
+#define q_OPENSSL_sk_new_null() q_sk_new_null()
+#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b)
+#define q_OPENSSL_sk_free q_sk_free
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
+#else
int q_OPENSSL_sk_num(OPENSSL_STACK *a);
void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
OPENSSL_STACK *q_OPENSSL_sk_new_null();
void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
void q_OPENSSL_sk_free(OPENSSL_STACK *a);
void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
+#endif
int q_SSL_session_reused(SSL *a);
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -112,8 +140,13 @@ int q_DH_bits(DH *dh);
# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+#else
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
+#endif
#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
| OPENSSL_INIT_ADD_ALL_DIGESTS \

View File

@ -1,106 +0,0 @@
Redefine SSL stack functions to their proper symbols in LibreSSL.
Also reference a redefined DSA_bits() that does not natively exist
in LibreSSL.
Ensure that we link to the correct ssl library selected in
DEFAULT_VERSIONS.
Do not define SSL_CONF_CTX symbols absent from LibreSSL.
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2018-12-03 11:15:26 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -152,6 +152,14 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w,
DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
+#ifdef LIBRESSL_VERSION_NUMBER
+DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return)
+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC2(void, sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+DEFINEFUNC2(void *, sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
+#else
DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
@@ -159,6 +167,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
+#endif
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
#ifdef TLS1_3_VERSION
@@ -443,7 +452,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
@@ -846,8 +855,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
#endif
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
if (libcrypto->load() && libssl->load()) {
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
return pair;
@@ -876,8 +885,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
// macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
// attempt, _after_ <bundle>/Contents/Frameworks has been searched.
// iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1);
+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1);
if (libcrypto->load() && libssl->load()) {
// libssl.so.0 and libcrypto.so.0 found
return pair;
@@ -961,12 +970,21 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(EVP_CIPHER_CTX_reset)
RESOLVEFUNC(EVP_PKEY_base_id)
RESOLVEFUNC(RSA_bits)
+#ifdef LIBRESSL_VERSION_NUMBER
+ RESOLVEFUNC(sk_new_null)
+ RESOLVEFUNC(sk_push)
+ RESOLVEFUNC(sk_free)
+ RESOLVEFUNC(sk_num)
+ RESOLVEFUNC(sk_pop_free)
+ RESOLVEFUNC(sk_value)
+#else
RESOLVEFUNC(OPENSSL_sk_new_null)
RESOLVEFUNC(OPENSSL_sk_push)
RESOLVEFUNC(OPENSSL_sk_free)
RESOLVEFUNC(OPENSSL_sk_num)
RESOLVEFUNC(OPENSSL_sk_pop_free)
RESOLVEFUNC(OPENSSL_sk_value)
+#endif
RESOLVEFUNC(DH_get0_pqg)
RESOLVEFUNC(SSL_CTX_set_options)
#ifdef TLS1_3_VERSION
@@ -1001,7 +1019,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
RESOLVEFUNC(DH_bits)
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(DSA_bits)
+#endif
#if QT_CONFIG(dtls)
RESOLVEFUNC(DTLSv1_listen)
@@ -1237,7 +1257,7 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
RESOLVEFUNC(SSL_CONF_CTX_new);
RESOLVEFUNC(SSL_CONF_CTX_free);
RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);

View File

@ -1,30 +0,0 @@
Define maximum TLS version as 1.2 so as to not hit any possibly
unsupported TLS 1.3 symbols.
Also do not define SSL_CONF_CTX symbols absent from LibreSSL.
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2018-12-03 11:15:26 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -74,6 +74,13 @@
QT_BEGIN_NAMESPACE
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+# define TLS1_2_VERSION 0x0303
+# define TLS_MAX_VERSION TLS1_2_VERSION
+# define TLS_ANY_VERSION 0x10000
+#endif
+
+
#define DUMMYARG
#if !defined QT_LINKED_OPENSSL
@@ -359,7 +366,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);

View File

@ -62,6 +62,8 @@
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplywasmimpl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocsp_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpserver_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpsocket_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h
@ -82,6 +84,7 @@
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpserver_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h
@ -124,6 +127,7 @@
%%QT_INCDIR%%/QtNetwork/QNetworkReply
%%QT_INCDIR%%/QtNetwork/QNetworkRequest
%%QT_INCDIR%%/QtNetwork/QNetworkSession
%%QT_INCDIR%%/QtNetwork/QOcspResponse
%%QT_INCDIR%%/QtNetwork/QSctpServer
%%QT_INCDIR%%/QtNetwork/QSctpSocket
%%QT_INCDIR%%/QtNetwork/QSsl
@ -167,6 +171,7 @@
%%QT_INCDIR%%/QtNetwork/qnetworkreply.h
%%QT_INCDIR%%/QtNetwork/qnetworkrequest.h
%%QT_INCDIR%%/QtNetwork/qnetworksession.h
%%QT_INCDIR%%/QtNetwork/qocspresponse.h
%%QT_INCDIR%%/QtNetwork/qpassworddigestor.h
%%QT_INCDIR%%/QtNetwork/qsctpserver.h
%%QT_INCDIR%%/QtNetwork/qsctpsocket.h

View File

@ -0,0 +1,67 @@
--- src/item_model.cpp.orig 2017-03-11 22:16:36.000000000 +0000
+++ src/item_model.cpp 2019-09-01 18:49:37.991420000 +0000
@@ -2,6 +2,8 @@
#include "icon_cache.h"
#include "utils.h"
+#include <algorithm>
+
namespace
{
static void advanceSpinner(QString& text)
@@ -10,7 +12,7 @@
QChar current = text[spinnerPos];
static const QChar spinner[] = { '-', '\\', '|', '/' };
size_t spinnerCount = sizeof(spinner) / sizeof(*spinner);
- const QChar* found = qFind(spinner, spinner + spinnerCount, current);
+ const QChar* found = std::find(spinner, spinner + spinnerCount, current);
size_t idx = found - spinner;
size_t next = idx == spinnerCount - 1 ? 0 : idx + 1;
text[spinnerPos] = spinner[next];
@@ -161,7 +163,7 @@
{
Item* item = get(index);
item->name = name;
- item->path = item->parent->path.filePath(item->name);
+ item->path.setPath(item->parent->path.filePath(item->name));
emit dataChanged(index, index, QVector<int>{Qt::DisplayRole});
}
@@ -182,7 +184,7 @@
Item* item = new Item();
item->isFolder = true;
item->name = name;
- item->path = path;
+ item->path.setPath(path);
item->parent = mRoot;
mRoot->childs.append(item);
@@ -500,7 +502,7 @@
auto it = existing.find(item->name);
if (it == existing.end())
{
- item->path = parent->path.filePath(item->name);
+ item->path.setPath(parent->path.filePath(item->name));
if (!item->isFolder && mFileIcons)
{
QString ext = QFileInfo(item->name).suffix();
@@ -561,8 +563,8 @@
}
};
- QObject::connect(lsd, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, rcloneFinished);
- QObject::connect(lsl, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, rcloneFinished);
+ QObject::connect(lsd, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, rcloneFinished);
+ QObject::connect(lsl, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, rcloneFinished);
QObject::connect(lsd, &QProcess::readyRead, this, [=]()
{
@@ -617,7 +619,7 @@
void ItemModel::sortRecursive(Item* item, const ItemSorter& sorter)
{
- qSort(item->childs.begin(), item->childs.end(), sorter);
+ std::sort(item->childs.begin(), item->childs.end(), sorter);
for (auto child : item->childs)
{

View File

@ -0,0 +1,11 @@
--- src/job_widget.cpp.orig 2017-03-11 22:16:36 UTC
+++ src/job_widget.cpp
@@ -162,7 +162,7 @@ JobWidget::JobWidget(QProcess* process, const QString&
}
});
- QObject::connect(mProcess, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int status)
+ QObject::connect(mProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int status)
{
mProcess->deleteLater();
for (auto label : mActive)

View File

@ -0,0 +1,38 @@
--- src/main_window.cpp.orig 2017-03-11 22:16:36 UTC
+++ src/main_window.cpp
@@ -193,7 +193,7 @@ void MainWindow::rcloneGetVersion()
QProcess* p = new QProcess();
- QObject::connect(p, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int code)
+ QObject::connect(p, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int code)
{
if (code == 0)
{
@@ -241,7 +241,7 @@ void MainWindow::rcloneConfig()
{
QProcess* p = new QProcess(this);
- QObject::connect(p, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int code)
+ QObject::connect(p, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int code)
{
if (code == 0)
{
@@ -297,7 +297,7 @@ void MainWindow::rcloneListRemotes()
QProcess* p = new QProcess();
- QObject::connect(p, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int code)
+ QObject::connect(p, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int code)
{
if (code == 0)
{
@@ -570,7 +570,7 @@ void MainWindow::addStream(const QString& remote, cons
auto rclone = new QProcess();
rclone->setStandardOutputProcess(player);
- QObject::connect(player, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int status)
+ QObject::connect(player, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int status)
{
player->deleteLater();
if (status != 0 && player->error() == QProcess::FailedToStart)

View File

@ -0,0 +1,11 @@
--- src/mount_widget.cpp.orig 2017-03-11 22:16:36 UTC
+++ src/mount_widget.cpp
@@ -57,7 +57,7 @@ MountWidget::MountWidget(QProcess* process, const QStr
}
});
- QObject::connect(mProcess, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int status)
+ QObject::connect(mProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int status)
{
mProcess->deleteLater();
mRunning = false;

View File

@ -0,0 +1,54 @@
--- src/remote_widget.cpp.orig 2017-03-11 22:16:36 UTC
+++ src/remote_widget.cpp
@@ -129,7 +129,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
UseRclonePassword(&process);
process.setProgram(GetRclone());
process.setArguments(QStringList() << "mkdir" << GetRcloneConf() << remote + ":" + folder);
- process.setReadChannelMode(QProcess::MergedChannels);
+ process.setProcessChannelMode(QProcess::MergedChannels);
ProgressDialog progress("New Folder", "Creating...", folderMsg, &process, this);
if (progress.exec() == QDialog::Accepted)
@@ -158,7 +158,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
<< GetRcloneConf()
<< remote + ":" + path
<< remote + ":" + model->path(index.parent()).filePath(name));
- process.setReadChannelMode(QProcess::MergedChannels);
+ process.setProcessChannelMode(QProcess::MergedChannels);
ProgressDialog progress("Rename", "Renaming...", pathMsg, &process, this);
if (progress.exec() == QDialog::Accepted)
@@ -182,13 +182,13 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
UseRclonePassword(&process);
process.setProgram(GetRclone());
process.setArguments(QStringList() << (model->isFolder(index) ? "purge" : "delete") << GetRcloneConf() << remote + ":" + path);
- process.setReadChannelMode(QProcess::MergedChannels);
+ process.setProcessChannelMode(QProcess::MergedChannels);
ProgressDialog progress("Delete", "Deleting...", pathMsg, &process, this);
if (progress.exec() == QDialog::Accepted)
{
QModelIndex parent = index.parent();
- QModelIndex next = parent.child(index.row() + 1, 0);
+ QModelIndex next = parent.model()->index(index.row() + 1, 0, parent);
ui.tree->selectionModel()->select(next.isValid() ? next : parent, QItemSelectionModel::SelectCurrent);
model->removeRow(index.row(), parent);
}
@@ -281,7 +281,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
UseRclonePassword(&process);
process.setProgram(GetRclone());
process.setArguments(QStringList() << "size" << GetRcloneConf() << remote + ":" + path);
- process.setReadChannelMode(QProcess::MergedChannels);
+ process.setProcessChannelMode(QProcess::MergedChannels);
ProgressDialog progress("Get Size", "Calculating...", pathMsg, &process, this, false);
progress.expand();
@@ -314,7 +314,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
UseRclonePassword(&process);
process.setProgram(GetRclone());
process.setArguments(QStringList() << GetRcloneConf() << e.getOptions());
- process.setReadChannelMode(QProcess::MergedChannels);
+ process.setProcessChannelMode(QProcess::MergedChannels);
ProgressDialog progress("Export", "Exporting...", dst, &process, this);
file->setParent(&progress);

View File

@ -0,0 +1,11 @@
--- src/stream_widget.cpp.orig 2017-03-11 22:16:36 UTC
+++ src/stream_widget.cpp
@@ -58,7 +58,7 @@ StreamWidget::StreamWidget(QProcess* rclone, QProcess*
}
});
- QObject::connect(mRclone, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=]()
+ QObject::connect(mRclone, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=]()
{
mRclone->deleteLater();
mRunning = false;

View File

@ -0,0 +1,11 @@
--- src/transfer_dialog.cpp.orig 2017-03-11 22:16:36 UTC
+++ src/transfer_dialog.cpp
@@ -131,7 +131,7 @@ QString TransferDialog::getMode() const
return "Sync";
}
- return QString::null;
+ return QString();
}
QString TransferDialog::getSource() const

View File

@ -24,4 +24,11 @@ USE_GITLAB= yes
GL_ACCOUNT= accounts-sso
GL_COMMIT= 2dd9ba521a0dd4277c4bf6970a7f4e3894fd85ae
# Fix for Qt5-5.13:
# oauth2plugin.cpp:133:9: error: 'addQueryItem' is deprecated [-Werror,-Wdeprecated-declarations]
# url.addQueryItem(CLIENT_ID, d->m_oauth2Data.ClientId());
# ^
post-patch:
${REINPLACE_CMD} '/-Werror/d' ${PATCH_WRKSRC}/common-project-config.pri
.include <bsd.port.mk>

View File

@ -1925,6 +1925,7 @@
SUBDIR += qooxdoo
SUBDIR += qt5-webchannel
SUBDIR += qt5-webengine
SUBDIR += qt5-webglplugin
SUBDIR += qt5-webkit
SUBDIR += qt5-websockets
SUBDIR += qt5-websockets-qml

View File

@ -0,0 +1,21 @@
# $FreeBSD$
PORTNAME= webglplugin
DISTVERSION= ${QT5_VERSION}
CATEGORIES= www
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt QPA plugin for running an application via a browser using streamed WebGL commands
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
USES= compiler:c++11-lang gl gnome qmake:norecursive qt-dist:5
USE_GL= gl
USE_GNOME= glib20
USE_QT= core dbus declarative gui network webchannel websockets \
buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWebGLIntegrationPlugin.cmake
%%QT_PLUGINDIR%%/platforms/libqwebgl.so
%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwebgl.so.debug

View File

@ -204,7 +204,6 @@
SUBDIR += py-xlib
SUBDIR += pypy-tkinter
SUBDIR += qml-box2d
SUBDIR += qt5-canvas3d
SUBDIR += qt5-charts
SUBDIR += qt5-datavis3d
SUBDIR += qt5-declarative

View File

@ -1,4 +0,0 @@
%%QT_QMLDIR%%/QtCanvas3D/libqtcanvas3d.so
%%DEBUG%%%%QT_QMLDIR%%/QtCanvas3D/libqtcanvas3d.so.debug
%%QT_QMLDIR%%/QtCanvas3D/plugins.qmltypes
%%QT_QMLDIR%%/QtCanvas3D/qmldir

View File

@ -49,6 +49,7 @@
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/charttitle_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartvalueaxisx_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartvalueaxisy_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/datetimeaxislabel_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/declarativeabstractrendernode_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/declarativeareaseries_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/declarativeaxes_p.h
@ -68,6 +69,7 @@
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/declarativesplineseries_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/declarativexypoint_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/declarativexyseries_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/editableaxislabel_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/glwidget_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/glxyseriesdata_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/horizontalaxis_p.h
@ -150,6 +152,7 @@
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/splineanimation_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/splinechartitem_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/stackedbarchartitem_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/valueaxislabel_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/verticalaxis_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xlogydomain_p.h
%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xlogypolardomain_p.h

View File

@ -75,6 +75,7 @@
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljslexer_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsmemorypool_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsparser_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljssourcelocation_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllist_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistaccessor_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistcompositor_p.h
@ -105,6 +106,7 @@
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlsourcecoordinate_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltableinstancemodel_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h
@ -159,6 +161,7 @@
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4executableallocator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4function_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4functionobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4functiontable_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4generatorobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4global_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4globalobject_p.h
@ -291,6 +294,10 @@
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugmessageclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginedebugclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginedebugclient_p_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlinspectorclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlinspectorclient_p_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlpreviewclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlpreviewclient_p_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlprofilerclient_p.h
@ -301,6 +308,8 @@
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlprofilereventreceiver_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlprofilereventtype_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlprofilertypedevent_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qv4debugclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qv4debugclient_p_p.h
%%QT_INCDIR%%/QtQmlDebug/QtQmlDebug
%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugDepends
%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion
@ -417,6 +426,7 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectsource_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshortcut_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksinglepointhandler_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksinglepointhandler_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickspringanimation_p.h

View File

@ -9,6 +9,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 Gamepad Module
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,gamepad
USE_QT= core declarative gui buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View File

@ -16,6 +16,7 @@
%%QT_INCDIR%%/QtGamepad/qtgamepadversion.h
%%QT_CMAKEDIR%%/Qt5Gamepad/Qt5GamepadConfig.cmake
%%QT_CMAKEDIR%%/Qt5Gamepad/Qt5GamepadConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Gamepad/Qt5Gamepad_QEvdevGamepadBackendPlugin.cmake
%%QT_LIBDIR%%/libQt5Gamepad.prl
%%QT_LIBDIR%%/libQt5Gamepad.so
%%QT_LIBDIR%%/libQt5Gamepad.so.5
@ -24,6 +25,8 @@
%%DEBUG%%%%QT_LIBDIR%%/libQt5Gamepad.so.%%FULLVER%%.debug
%%QT_MKSPECDIR%%/modules/qt_lib_gamepad.pri
%%QT_MKSPECDIR%%/modules/qt_lib_gamepad_private.pri
%%QT_PLUGINDIR%%/gamepads/libevdevgamepad.so
%%DEBUG%%%%QT_PLUGINDIR%%/gamepads/libevdevgamepad.so.debug
%%QT_QMLDIR%%/QtGamepad/libdeclarative_gamepad.so
%%DEBUG%%%%QT_QMLDIR%%/QtGamepad/libdeclarative_gamepad.so.debug
%%QT_QMLDIR%%/QtGamepad/plugins.qmltypes

View File

@ -11,9 +11,11 @@ COMMENT= Qt graphical user interface module
BUILD_DEPENDS= at-spi2-core>=0:accessibility/at-spi2-core
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libevdev.so:devel/libevdev \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
libinput.so:x11/libinput \
libpng.so:graphics/png \
libxcb.so:x11/libxcb \
libxcb-image.so:x11/xcb-util-image \
@ -30,7 +32,6 @@ USE_QT= core dbus network qmake_build buildtools_build
USE_XORG= ice sm x11 xi xrender
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-eglfs \
-no-evdev \
-no-libudev \
-system-harfbuzz
# Explicitely set to c++14 as to net get c++17/c++1z, as libX11's headers

View File

@ -1,17 +0,0 @@
Avoid selecting BGR visuals. On Intel i915 systems, selecting one of
these results in red-blue swapping later in the graphics pipeline.
PR 223638 has an extensive discussion.
--- src/platformsupport/glxconvenience/qglxconvenience.cpp.orig 2018-01-16 06:53:43 UTC
+++ src/platformsupport/glxconvenience/qglxconvenience.cpp
@@ -220,6 +220,10 @@ GLXFBConfig qglx_findConfig(Display *dis
if (requestedAlpha && actualAlpha != requestedAlpha)
continue;
+ // avoid BGR visuals due to bugs elsewhere
+ if ((visual->red_mask & 0x1) == 0x1)
+ continue;
+
return candidate;
}
} while (qglx_reduceFormat(&format));

View File

@ -69,6 +69,7 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractlayoutstyleinfo_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstracttextdocumentlayout_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblecache_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qastchandler_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qbezier_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qblendfunctions_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qblittable_p.h
@ -210,6 +211,7 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qvectorpath_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qvulkanfunctions_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qvulkanwindow_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qwasmlocalfileaccess_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qwindow_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qxbmhandler_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qxpmhandler_p.h
@ -647,6 +649,29 @@
%%QT_INCDIR%%/QtGui/qwindow.h
%%QT_INCDIR%%/QtGui/qwindowdefs.h
%%QT_INCDIR%%/QtGui/qwindowdefs_win.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardhandler_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardmanager_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevmousehandler_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevmousemanager_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtablethandler_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtabletmanager_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchfilter_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchhandler_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchmanager_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputhandler_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputkeyboard_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputpointer_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputtouch_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qtouchoutputmapping_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qtslib_p.h
%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qxkbcommon_p.h
%%QT_INCDIR%%/QtInputSupport/QIntegrityHIDManager
%%QT_INCDIR%%/QtInputSupport/QtInputSupport
%%QT_INCDIR%%/QtInputSupport/QtInputSupportDepends
%%QT_INCDIR%%/QtInputSupport/QtInputSupportVersion
%%QT_INCDIR%%/QtInputSupport/qintegrityhidmanager.h
%%QT_INCDIR%%/QtInputSupport/qtinputsupportversion.h
%%QT_INCDIR%%/QtKmsSupport/%%FULLVER%%/QtKmsSupport/private/qkmsdevice_p.h
%%QT_INCDIR%%/QtKmsSupport/QtKmsSupport
%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportDepends
@ -724,6 +749,11 @@
%%QT_INCDIR%%/QtThemeSupport/QtThemeSupportDepends
%%QT_INCDIR%%/QtThemeSupport/QtThemeSupportVersion
%%QT_INCDIR%%/QtThemeSupport/qtthemesupportversion.h
%%QT_INCDIR%%/QtXkbCommonSupport/%%FULLVER%%/QtXkbCommonSupport/private/qxkbcommon_p.h
%%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupport
%%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupportDepends
%%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupportVersion
%%QT_INCDIR%%/QtXkbCommonSupport/qtxkbcommonsupportversion.h
%%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfig.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfigExtras.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfigVersion.cmake
@ -731,6 +761,10 @@
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QBsdKeyboardPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QBsdMousePlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QGifPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QICOPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
@ -767,6 +801,10 @@
%%QT_LIBDIR%%/libQt5Gui.so.%%SHORTVER%%
%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug
%%QT_LIBDIR%%/libQt5InputSupport.a
%%QT_LIBDIR%%/libQt5InputSupport.prl
%%QT_LIBDIR%%/libQt5XkbCommonSupport.a
%%QT_LIBDIR%%/libQt5XkbCommonSupport.prl
%%QT_LIBDIR%%/libQt5KmsSupport.a
%%QT_LIBDIR%%/libQt5KmsSupport.prl
%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a
@ -795,6 +833,7 @@
%%QT_MKSPECDIR%%/modules/qt_lib_glx_support_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_gui.pri
%%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_input_support_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_kms_support_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_linuxaccessibility_support_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions.pri
@ -803,12 +842,21 @@
%%QT_MKSPECDIR%%/modules/qt_lib_service_support_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_theme_support_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_xkbcommon_support_private.pri
%%QT_PLUGINDIR%%/generic/libqbsdkeyboardplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqbsdkeyboardplugin.so.debug
%%QT_PLUGINDIR%%/generic/libqbsdmouseplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqbsdmouseplugin.so.debug
%%QT_PLUGINDIR%%/generic/libqtuiotouchplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqtuiotouchplugin.so.debug
%%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so.debug
%%QT_PLUGINDIR%%/generic/libqevdevmouseplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevmouseplugin.so.debug
%%QT_PLUGINDIR%%/generic/libqevdevtabletplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevtabletplugin.so.debug
%%QT_PLUGINDIR%%/generic/libqevdevtouchplugin.so
%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevtouchplugin.so.debug
%%QT_PLUGINDIR%%/imageformats/libqgif.so
%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug
%%QT_PLUGINDIR%%/imageformats/libqico.so

View File

@ -265,6 +265,7 @@
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so.debug
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Styles/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Switch.qml

View File

@ -100,6 +100,8 @@
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickslider_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickspinbox_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicksplitview_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicksplitview_p_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickstackelement_p_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickstacktransition_p_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickstackview_p.h
@ -134,6 +136,8 @@
%%QT_INCDIR%%/QtQuickTemplates2/qtquicktemplates2version.h
%%QT_CMAKEDIR%%/Qt5QuickControls2/Qt5QuickControls2Config.cmake
%%QT_CMAKEDIR%%/Qt5QuickControls2/Qt5QuickControls2ConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5QuickTemplates2/Qt5QuickTemplates2Config.cmake
%%QT_CMAKEDIR%%/Qt5QuickTemplates2/Qt5QuickTemplates2ConfigVersion.cmake
%%QT_LIBDIR%%/libQt5QuickControls2.prl
%%QT_LIBDIR%%/libQt5QuickControls2.so
%%QT_LIBDIR%%/libQt5QuickControls2.so.5
@ -148,6 +152,7 @@
%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickTemplates2.so.%%FULLVER%%.debug
%%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quicktemplates2.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quicktemplates2_private.pri
%%QT_QMLDIR%%/Qt/labs/calendar/DayOfWeekRow.qml
%%QT_QMLDIR%%/Qt/labs/calendar/DayOfWeekRow.qmlc
@ -219,6 +224,7 @@
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/SliderGroove.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/SliderHandle.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/SpinBox.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/SplitView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/SwipeDelegate.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/Switch.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/SwitchDelegate.qml
@ -268,6 +274,7 @@
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/ScrollIndicator.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/Slider.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/SpinBox.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/SplitView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/StackView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/SwipeDelegate.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/SwipeView.qml
@ -328,6 +335,7 @@
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Slider.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SliderHandle.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SpinBox.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SplitView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/StackView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SwipeDelegate.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SwipeView.qml
@ -366,6 +374,7 @@
%%QT_QMLDIR%%/QtQuick/Controls.2/ScrollView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Slider.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/SpinBox.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/SplitView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/StackView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/SwipeDelegate.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/SwipeView.qml
@ -415,6 +424,7 @@
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ScrollIndicator.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Slider.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SpinBox.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SplitView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/StackView.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SwipeDelegate.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Switch.qml
@ -574,3 +584,4 @@
%%QT_QMLDIR%%/QtQuick/Templates.2/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick/Templates.2/qmldir
libdata/pkgconfig/Qt5QuickControls2.pc
libdata/pkgconfig/Qt5QuickTemplates2.pc

View File

@ -1,6 +1,6 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-03-18 18:26:39 UTC
--- src/src.pro.orig 2019-02-14 20:00:52 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs