From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C8D571389E2 for ; Fri, 12 Dec 2014 17:38:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACA37E0B71; Fri, 12 Dec 2014 17:38:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43A3CE0B71 for ; Fri, 12 Dec 2014 17:38:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAA6D340707 for ; Fri, 12 Dec 2014 17:38:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96008C3CA for ; Fri, 12 Dec 2014 17:38:14 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1418405850.e8f1249313077aae509e42271e430de02c4582ac.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/files/, dev-qt/qtsql/files/, dev-qt/qtwebsockets/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch X-VCS-Directories: dev-qt/qtwidgets/files/ dev-qt/qtsql/files/ dev-qt/qtwebsockets/files/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: e8f1249313077aae509e42271e430de02c4582ac X-VCS-Branch: master Date: Fri, 12 Dec 2014 17:38:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4c34640-ffcf-4e46-b360-9af503e121d0 X-Archives-Hash: b4940981cc1ecc1e6bfe916e3f695612 commit: e8f1249313077aae509e42271e430de02c4582ac Author: Davide Pesavento gentoo org> AuthorDate: Fri Dec 12 17:37:30 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Dec 12 17:37:30 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e8f12493 Delete unused patches. --- .../qtsql/files/qtsql-5.3.1-path-filtering.patch | 31 -- ...01-Remove-dependency-on-unused-sql-module.patch | 28 -- .../files/qtwidgets-5.3.1-prefer-qpa.patch | 343 --------------------- 3 files changed, 402 deletions(-) diff --git a/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch b/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch deleted file mode 100644 index 6571896..0000000 --- a/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9de7b4d7501c7e8e9eb561d02149a52b05a2bc1d Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Fri, 27 Jun 2014 04:25:52 +1000 -Subject: [PATCH] Canonicalize inputs when filtering default system paths - -Contrary to expectations, various -config tools sometimes spit out -denormalized paths, which breaks the text-based filtering, as it relies -on exact matches with normalized paths. - -Change-Id: I0613ed24953a3bde19939d28d09572c88b43a361 -Task-number: QTBUG-39216 -Reviewed-by: Oswald Buddenhagen ---- - configure | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure b/configure -index 8c16b12..96cc82b 100755 ---- a/configure -+++ b/configure -@@ -364,6 +364,7 @@ filterDefaultPaths() - { - local path - path=`cat` -+ path=`"$relpath/config.tests/unix/makeabs" "$path"` - echo "$1" | grep "^$path\$" > /dev/null || echo "$path" - } - --- -1.8.5.5 - diff --git a/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch b/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch deleted file mode 100644 index 4c71a8d..0000000 --- a/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6bd414a1f74f5a0ebfc1f4abcc140f7b3b536e1b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= -Date: Tue, 20 May 2014 16:15:43 +0300 -Subject: Remove dependency on unused sql module - -Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403 -Reviewed-by: Kurt Pattyn -Reviewed-by: Davide Pesavento ---- - src/websockets/websockets.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro -index 99e84b6..5b5ff78 100644 ---- a/src/websockets/websockets.pro -+++ b/src/websockets/websockets.pro -@@ -1,7 +1,7 @@ - load(qt_build_config) - TARGET = QtWebSockets - --QT = core network core-private sql -+QT = core network core-private - - TEMPLATE = lib - --- -1.9.3 - diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch deleted file mode 100644 index 2a5d130..0000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch +++ /dev/null @@ -1,343 +0,0 @@ -From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= -Date: Wed, 19 Feb 2014 11:01:44 +0100 -Subject: Prefer QPA implementation in qsystemtrayicon_x11 if available - -In order to have the possibility to provide a custom QSystemTrayIcon -implementation in the platform theme instead of the X11 xembed based -one, the qpa implementation needs to be called. This was not possible -as qpa and x11 implementation were compile time mutual exclusive. - -This change moves the qpa implementation in the shared part and the -methods in qsystemtrayicon_qpa just delegate to them. In addition the -_x11 part tries to create a QPlatformSystemTrayIcon through the -platform theme and if that succeeds the implementation prefers the qpa -variant and delegates to the same methods. - -Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561 -Reviewed-by: Kevin Krammer -Reviewed-by: Friedemann Kleint -Reviewed-by: Paul Olav Tvete ---- - src/widgets/util/qsystemtrayicon.cpp | 68 ++++++++++++++++++++++++++++++++ - src/widgets/util/qsystemtrayicon_p.h | 9 +++++ - src/widgets/util/qsystemtrayicon_qpa.cpp | 51 +++++------------------- - src/widgets/util/qsystemtrayicon_x11.cpp | 40 ++++++++++++++++++- - 4 files changed, 126 insertions(+), 42 deletions(-) - -diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp -index f1a69e6..fa318f3 100644 ---- a/src/widgets/util/qsystemtrayicon.cpp -+++ b/src/widgets/util/qsystemtrayicon.cpp -@@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e) - QWidget::timerEvent(e); - } - -+////////////////////////////////////////////////////////////////////// -+void QSystemTrayIconPrivate::install_sys_qpa() -+{ -+ qpa_sys->init(); -+ QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)), -+ q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason))); -+ QObject::connect(qpa_sys, &QPlatformSystemTrayIcon::messageClicked, -+ q_func(), &QSystemTrayIcon::messageClicked); -+ updateMenu_sys(); -+ updateIcon_sys(); -+ updateToolTip_sys(); -+} -+ -+void QSystemTrayIconPrivate::remove_sys_qpa() -+{ -+ qpa_sys->cleanup(); -+} -+ -+QRect QSystemTrayIconPrivate::geometry_sys_qpa() const -+{ -+ return qpa_sys->geometry(); -+} -+ -+void QSystemTrayIconPrivate::updateIcon_sys_qpa() -+{ -+ qpa_sys->updateIcon(icon); -+} -+ -+void QSystemTrayIconPrivate::updateMenu_sys_qpa() -+{ -+ if (menu) { -+ if (!menu->platformMenu()) { -+ QPlatformMenu *platformMenu = qpa_sys->createMenu(); -+ if (platformMenu) -+ menu->setPlatformMenu(platformMenu); -+ } -+ qpa_sys->updateMenu(menu->platformMenu()); -+ } -+} -+ -+void QSystemTrayIconPrivate::updateToolTip_sys_qpa() -+{ -+ qpa_sys->updateToolTip(toolTip); -+} -+ -+void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message, -+ const QString &title, -+ QSystemTrayIcon::MessageIcon icon, -+ int msecs) -+{ -+ QIcon notificationIcon; -+ switch (icon) { -+ case QSystemTrayIcon::Information: -+ notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation); -+ break; -+ case QSystemTrayIcon::Warning: -+ notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning); -+ break; -+ case QSystemTrayIcon::Critical: -+ notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical); -+ break; -+ default: -+ break; -+ } -+ qpa_sys->showMessage(message, title, notificationIcon, -+ static_cast(icon), msecs); -+} -+ - QT_END_NAMESPACE - - #endif // QT_NO_SYSTEMTRAYICON -diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h -index 211ef30..317664a 100644 ---- a/src/widgets/util/qsystemtrayicon_p.h -+++ b/src/widgets/util/qsystemtrayicon_p.h -@@ -98,6 +98,15 @@ public: - QSystemTrayIconSys *sys; - QPlatformSystemTrayIcon *qpa_sys; - bool visible; -+ -+private: -+ void install_sys_qpa(); -+ void remove_sys_qpa(); -+ void updateIcon_sys_qpa(); -+ void updateToolTip_sys_qpa(); -+ void updateMenu_sys_qpa(); -+ QRect geometry_sys_qpa() const; -+ void showMessage_sys_qpa(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs); - }; - - class QBalloonTip : public QWidget -diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp -index f98aeaf..045641c 100644 ---- a/src/widgets/util/qsystemtrayicon_qpa.cpp -+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp -@@ -65,28 +65,20 @@ QSystemTrayIconPrivate::~QSystemTrayIconPrivate() - - void QSystemTrayIconPrivate::install_sys() - { -- if (qpa_sys) { -- qpa_sys->init(); -- QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)), -- q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason))); -- QObject::connect(qpa_sys, SIGNAL(messageClicked()), -- q_func(), SIGNAL(messageClicked())); -- updateMenu_sys(); -- updateIcon_sys(); -- updateToolTip_sys(); -- } -+ if (qpa_sys) -+ install_sys_qpa(); - } - - void QSystemTrayIconPrivate::remove_sys() - { - if (qpa_sys) -- qpa_sys->cleanup(); -+ remove_sys_qpa(); - } - - QRect QSystemTrayIconPrivate::geometry_sys() const - { - if (qpa_sys) -- return qpa_sys->geometry(); -+ return geometry_sys_qpa(); - else - return QRect(); - } -@@ -94,25 +86,19 @@ QRect QSystemTrayIconPrivate::geometry_sys() const - void QSystemTrayIconPrivate::updateIcon_sys() - { - if (qpa_sys) -- qpa_sys->updateIcon(icon); -+ updateIcon_sys_qpa(); - } - - void QSystemTrayIconPrivate::updateMenu_sys() - { -- if (qpa_sys && menu) { -- if (!menu->platformMenu()) { -- QPlatformMenu *platformMenu = qpa_sys->createMenu(); -- if (platformMenu) -- menu->setPlatformMenu(platformMenu); -- } -- qpa_sys->updateMenu(menu->platformMenu()); -- } -+ if (qpa_sys) -+ updateMenu_sys_qpa(); - } - - void QSystemTrayIconPrivate::updateToolTip_sys() - { - if (qpa_sys) -- qpa_sys->updateToolTip(toolTip); -+ updateToolTip_sys_qpa(); - } - - bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() -@@ -138,25 +124,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &message, - QSystemTrayIcon::MessageIcon icon, - int msecs) - { -- if (!qpa_sys) -- return; -- -- QIcon notificationIcon; -- switch (icon) { -- case QSystemTrayIcon::Information: -- notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation); -- break; -- case QSystemTrayIcon::Warning: -- notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning); -- break; -- case QSystemTrayIcon::Critical: -- notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical); -- break; -- default: -- break; -- } -- qpa_sys->showMessage(message, title, notificationIcon, -- static_cast(icon), msecs); -+ if (qpa_sys) -+ showMessage_sys_qpa(message, title, icon, msecs); - } - - QT_END_NAMESPACE -diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp -index 347e570..27d0418 100644 ---- a/src/widgets/util/qsystemtrayicon_x11.cpp -+++ b/src/widgets/util/qsystemtrayicon_x11.cpp -@@ -55,6 +55,9 @@ - #include - #include - #include -+#include -+#include -+#include - #include - - #ifndef QT_NO_SYSTEMTRAYICON -@@ -209,16 +212,22 @@ void QSystemTrayIconSys::paintEvent(QPaintEvent *) - - QSystemTrayIconPrivate::QSystemTrayIconPrivate() - : sys(0), -+ qpa_sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()), - visible(false) - { - } - - QSystemTrayIconPrivate::~QSystemTrayIconPrivate() - { -+ delete qpa_sys; - } - - void QSystemTrayIconPrivate::install_sys() - { -+ if (qpa_sys) { -+ install_sys_qpa(); -+ return; -+ } - Q_Q(QSystemTrayIcon); - if (!sys && locateSystemTray()) { - sys = new QSystemTrayIconSys(q); -@@ -229,6 +238,8 @@ void QSystemTrayIconPrivate::install_sys() - - QRect QSystemTrayIconPrivate::geometry_sys() const - { -+ if (qpa_sys) -+ return geometry_sys_qpa(); - if (!sys) - return QRect(); - return sys->globalGeometry(); -@@ -236,6 +247,10 @@ QRect QSystemTrayIconPrivate::geometry_sys() const - - void QSystemTrayIconPrivate::remove_sys() - { -+ if (qpa_sys) { -+ remove_sys_qpa(); -+ return; -+ } - if (!sys) - return; - QBalloonTip::hideBalloon(); -@@ -246,17 +261,26 @@ void QSystemTrayIconPrivate::remove_sys() - - void QSystemTrayIconPrivate::updateIcon_sys() - { -+ if (qpa_sys) { -+ updateIcon_sys_qpa(); -+ return; -+ } - if (sys) - sys->updateIcon(); - } - - void QSystemTrayIconPrivate::updateMenu_sys() - { -- -+ if (qpa_sys) -+ updateMenu_sys_qpa(); - } - - void QSystemTrayIconPrivate::updateToolTip_sys() - { -+ if (qpa_sys) { -+ updateToolTip_sys_qpa(); -+ return; -+ } - if (!sys) - return; - #ifndef QT_NO_TOOLTIP -@@ -266,6 +290,11 @@ void QSystemTrayIconPrivate::updateToolTip_sys() - - bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() - { -+ QScopedPointer sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()); -+ if (sys) -+ return sys->isSystemTrayAvailable(); -+ -+ // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior - const QString platform = QGuiApplication::platformName(); - if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive) == 0) - return locateSystemTray(); -@@ -274,12 +303,21 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() - - bool QSystemTrayIconPrivate::supportsMessages_sys() - { -+ QScopedPointer sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()); -+ if (sys) -+ return sys->supportsMessages(); -+ -+ // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior - return true; - } - - void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title, - QSystemTrayIcon::MessageIcon icon, int msecs) - { -+ if (qpa_sys) { -+ showMessage_sys_qpa(message, title, icon, msecs); -+ return; -+ } - if (!sys) - return; - const QPoint g = sys->globalGeometry().topLeft(); --- -2.0.0 -