SVN commit 13599 by tcberner: Merge branches/qt-5.7 into plasma5 ... [probably doing it mostly wrong]... time for some omelettes
_M . (directory) M +2 -2 PYQT/Mk/Uses/pyqt.mk M +51 -56 PYQT/devel/py-qt5-core/files/patch-configure.py M +3 -3 PYQT/devel/py-qt5/distinfo M +3 -5 PYQT/misc/py-qt5-demo/Makefile M +21 -0 PYQT/misc/py-qt5-doc/pkg-plist M +6 -0 PYQT/textproc/py-qt5-xml/pkg-plist M +240 -192 QT/Mk/bsd.qt.mk M +1 -0 QT/accessibility/qt4-accessible/Makefile M +1 -0 QT/chinese/qt4-codecs-cn/Makefile M +1 -0 QT/chinese/qt4-codecs-tw/Makefile M +1 -1 QT/comms/qt5-connectivity/Makefile M +19 -8 QT/comms/qt5-connectivity/pkg-plist M +1 -1 QT/comms/qt5-sensors/Makefile M +5 -5 QT/comms/qt5-sensors/pkg-plist M +4 -2 QT/comms/qt5-serialbus/pkg-plist M +2 -2 QT/comms/qt5-serialport/pkg-plist M +2 -2 QT/databases/qt4-ibase-plugin/Makefile M +3 -1 QT/databases/qt4-mysql-plugin/Makefile M +3 -1 QT/databases/qt4-odbc-plugin/Makefile M +3 -1 QT/databases/qt4-pgsql-plugin/Makefile M +1 -0 QT/databases/qt4-sql/Makefile M +3 -1 QT/databases/qt4-sqlite-plugin/Makefile M +3 -1 QT/databases/qt4-sqlite3-plugin/Makefile M +2 -2 QT/databases/qt5-sql/pkg-plist D QT/devel/dbus-qt4 (directory) D QT/devel/dbus-qt5 (directory) D QT/devel/qmake4 (directory) D QT/devel/qmake5 (directory) M +1 -1 QT/devel/qt4-assistant-adp/Makefile M +3 -0 QT/devel/qt4-assistant/Makefile M +2 -2 QT/devel/qt4-assistant/pkg-plist M +1 -1 QT/devel/qt4-corelib/Makefile A QT/devel/qt4-dbus (directory) M +1 -0 QT/devel/qt4-dbus/Makefile M +3 -0 QT/devel/qt4-designer/Makefile M +2 -2 QT/devel/qt4-designer/pkg-plist M +1 -0 QT/devel/qt4-help-tools/Makefile M +1 -0 QT/devel/qt4-help/Makefile M +1 -1 QT/devel/qt4-libqtassistantclient/Makefile M +3 -0 QT/devel/qt4-linguist/Makefile M +2 -2 QT/devel/qt4-linguist/pkg-plist M +3 -0 QT/devel/qt4-linguisttools/Makefile M +4 -4 QT/devel/qt4-linguisttools/pkg-plist M +3 -0 QT/devel/qt4-makeqpf/Makefile M +2 -2 QT/devel/qt4-makeqpf/pkg-plist M +3 -1 QT/devel/qt4-moc/Makefile M +2 -2 QT/devel/qt4-moc/pkg-plist M +1 -0 QT/devel/qt4-porting/Makefile M +2 -0 QT/devel/qt4-qdbusviewer/Makefile M +3 -0 QT/devel/qt4-qdoc3/Makefile A QT/devel/qt4-qmake (directory) M +1 -1 QT/devel/qt4-qmake/Makefile M +3 -0 QT/devel/qt4-qmlviewer/Makefile M +1 -0 QT/devel/qt4-qt3support/Makefile M +3 -0 QT/devel/qt4-qvfb/Makefile M +2 -2 QT/devel/qt4-qvfb/pkg-plist M +3 -0 QT/devel/qt4-rcc/Makefile M +3 -0 QT/devel/qt4-script/Makefile M +1 -0 QT/devel/qt4-scripttools/Makefile M +1 -0 QT/devel/qt4-testlib/Makefile M +3 -0 QT/devel/qt4-uic/Makefile M +2 -2 QT/devel/qt4-uic/pkg-plist M +3 -0 QT/devel/qt4-uic3/Makefile M +2 -2 QT/devel/qt5-buildtools/pkg-plist M +2 -2 QT/devel/qt5-concurrent/pkg-plist M +10 -5 QT/devel/qt5-core/Makefile M +14 -20 QT/devel/qt5-core/pkg-plist A QT/devel/qt5-dbus (directory) M +5 -5 QT/devel/qt5-designer/pkg-plist M +1 -3 QT/devel/qt5-help/Makefile M +2 -3 QT/devel/qt5-help/files/patch-src__assistant__assistant.pro M +4 -4 QT/devel/qt5-help/pkg-plist A QT/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro branches/qt-5.7/QT/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro#13234 M +3 -3 QT/devel/qt5-linguisttools/pkg-plist M +1 -1 QT/devel/qt5-location/Makefile M +14 -11 QT/devel/qt5-location/pkg-plist M +10 -8 QT/devel/qt5-qdoc/Makefile A QT/devel/qt5-qdoc/pkg-plist branches/qt-5.7/QT/devel/qt5-qdoc/pkg-plist#13234 A QT/devel/qt5-qmake (directory) M +2 -2 QT/devel/qt5-script/pkg-plist M +2 -2 QT/devel/qt5-scripttools/pkg-plist A QT/devel/qt5-scxml (directory) M +8 -6 QT/devel/qt5-scxml/pkg-plist M +4 -3 QT/devel/qt5-testlib/pkg-plist M +2 -2 QT/devel/qt5-uitools/pkg-plist M +1 -1 QT/devel/qt5/Makefile.sqldrivers M +59 -47 QT/devel/qt5/distinfo M +21 -21 QT/devel/qt5/files/extrapatch-configure A QT/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf branches/qt-5.7/QT/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf#13234 M +3 -3 QT/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf D QT/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h M +1 -0 QT/graphics/qt4-iconengines/Makefile M +1 -0 QT/graphics/qt4-imageformats/Makefile M +1 -0 QT/graphics/qt4-opengl/Makefile M +1 -0 QT/graphics/qt4-pixeltool/Makefile M +1 -0 QT/graphics/qt4-svg/Makefile M +2 -3 QT/graphics/qt5-3d/Makefile A QT/graphics/qt5-3d/files (directory) M +414 -261 QT/graphics/qt5-3d/pkg-plist M +2 -0 QT/graphics/qt5-graphicaleffects/pkg-plist M +8 -8 QT/graphics/qt5-imageformats/pkg-plist M +2 -2 QT/graphics/qt5-opengl/pkg-plist M +4 -4 QT/graphics/qt5-svg/pkg-plist M +1 -0 QT/japanese/qt4-codecs-jp/Makefile M +1 -0 QT/korean/qt4-codecs-kr/Makefile M +4 -3 QT/lang/qt5-qml/files/patch-src__src.pro M +5 -3 QT/lang/qt5-qml/pkg-plist M +1 -0 QT/misc/qt4-doc/Makefile M +1 -0 QT/misc/qt4-l10n/Makefile M +3 -0 QT/misc/qt4-qtconfig/Makefile M +2 -2 QT/misc/qt4-qtconfig/pkg-plist M +1 -0 QT/misc/qt4-qtdemo/Makefile M +3 -2 QT/misc/qt5-doc/Makefile M +3 -3 QT/misc/qt5-doc/distinfo M +2482 -1037 QT/misc/qt5-doc/pkg-plist M +7 -7 QT/misc/qt5-examples/Makefile M +569 -289 QT/misc/qt5-examples/pkg-plist M +5 -0 QT/misc/qt5-l10n/pkg-plist AM QT/misc/qtchooser (directory) M +1 -0 QT/multimedia/qt4-multimedia/Makefile M +8 -3 QT/multimedia/qt5-multimedia/Makefile M +12 -12 QT/multimedia/qt5-multimedia/pkg-plist M +2 -3 QT/net/qt4-network/Makefile M +4 -3 QT/net/qt5-network/pkg-plist M +6 -0 QT/print/qt5-printsupport/Makefile M +3 -3 QT/print/qt5-printsupport/pkg-plist D QT/textproc/clucene-qt4 (directory) A QT/textproc/qt4-clucene (directory) M +1 -0 QT/textproc/qt4-clucene/Makefile M +1 -0 QT/textproc/qt4-xml/Makefile M +1 -0 QT/textproc/qt4-xmlpatterns-tool/Makefile M +3 -0 QT/textproc/qt4-xmlpatterns/Makefile M +2 -2 QT/textproc/qt5-xml/pkg-plist M +2 -2 QT/textproc/qt5-xmlpatterns/pkg-plist A QT/www/qt4-webkit (directory) M +1 -0 QT/www/qt4-webkit/Makefile M +2 -2 QT/www/qt5-webchannel/pkg-plist M +1 -0 QT/www/qt5-webengine/Makefile M +6 -6 QT/www/qt5-webengine/pkg-plist A QT/www/qt5-webkit (directory) M +2 -2 QT/www/qt5-websockets/pkg-plist D QT/www/webkit-qt4 (directory) D QT/www/webkit-qt5 (directory) M +1 -0 QT/x11-toolkits/qt4-declarative/Makefile M +1 -1 QT/x11-toolkits/qt4-gui/Makefile M +1 -1 QT/x11-toolkits/qt5-canvas3d/Makefile _M QT/x11-toolkits/qt5-charts (directory) M +3 -17 QT/x11-toolkits/qt5-charts/Makefile D QT/x11-toolkits/qt5-charts/distinfo D QT/x11-toolkits/qt5-charts/files (directory) M +139 -137 QT/x11-toolkits/qt5-charts/pkg-plist A QT/x11-toolkits/qt5-datavis3d (directory) M +2 -2 QT/x11-toolkits/qt5-datavis3d/pkg-plist A QT/x11-toolkits/qt5-declarative-render2d (directory) M +1 -1 QT/x11-toolkits/qt5-declarative-render2d/pkg-plist M +0 -1 QT/x11-toolkits/qt5-declarative/distinfo A QT/x11-toolkits/qt5-declarative/files (directory) M +5 -5 QT/x11-toolkits/qt5-declarative/pkg-plist A QT/x11-toolkits/qt5-gamepad (directory) M +2 -2 QT/x11-toolkits/qt5-gamepad/pkg-plist M +2 -20 QT/x11-toolkits/qt5-gui/Makefile M +24 -17 QT/x11-toolkits/qt5-gui/pkg-plist M +44 -13 QT/x11-toolkits/qt5-quick/pkg-plist M +7 -5 QT/x11-toolkits/qt5-quickcontrols/pkg-plist M +371 -305 QT/x11-toolkits/qt5-quickcontrols2/pkg-plist M +2 -2 QT/x11-toolkits/qt5-uiplugin/Makefile M +2 -2 QT/x11-toolkits/qt5-uiplugin/pkg-plist A QT/x11-toolkits/qt5-virtualkeyboard (directory) M +7 -5 QT/x11-toolkits/qt5-virtualkeyboard/pkg-plist M +11 -11 QT/x11-toolkits/qt5-widgets/Makefile M +9 -12 QT/x11-toolkits/qt5-widgets/pkg-plist M +1 -0 QT/x11/qt4-graphicssystems-opengl/Makefile M +1 -0 QT/x11/qt4-inputmethods/Makefile M +2 -2 QT/x11/qt5-x11extras/pkg-plist
