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 286EA1387D3 for ; Sat, 25 Oct 2014 16:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5817E08EB; Sat, 25 Oct 2014 16:36:44 +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 4B719E08EB for ; Sat, 25 Oct 2014 16:36:44 +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 BBE3E340411 for ; Sat, 25 Oct 2014 16:36:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 690408B87 for ; Sat, 25 Oct 2014 16:36:38 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1414254888.d52dc091022034c0dbc2293763e1daf466bffd9d.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kwin/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kwin/files/kwin-5.0.2-qt54.patch X-VCS-Directories: kde-base/kwin/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d52dc091022034c0dbc2293763e1daf466bffd9d X-VCS-Branch: master Date: Sat, 25 Oct 2014 16:36:38 +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: 7c7b3708-db83-4d2c-bf32-410af97b2817 X-Archives-Hash: a3759c2a32b9179db656cc8af6c35b91 commit: d52dc091022034c0dbc2293763e1daf466bffd9d Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 25 16:34:48 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Oct 25 16:34:48 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d52dc091 [kde-base/kwin] Remove unused patch. Package-Manager: portage-2.2.14 --- kde-base/kwin/files/kwin-5.0.2-qt54.patch | 37 ------------------------------- 1 file changed, 37 deletions(-) diff --git a/kde-base/kwin/files/kwin-5.0.2-qt54.patch b/kde-base/kwin/files/kwin-5.0.2-qt54.patch deleted file mode 100644 index e490a94..0000000 --- a/kde-base/kwin/files/kwin-5.0.2-qt54.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit c00c67bf29c10862a973289486a535c8566d5110 -Author: Martin Gräßlin -Date: Wed Sep 3 09:47:21 2014 +0200 - - [scripting] Drop qmlRegisterType for QQuickWindow - - Not needed as one can just do: - import QtQuick.Window; - - This fixes a build problem with Qt 5.4. - - BUG: 338277 - -diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp -index 3bc4358..9dc7bad 100644 ---- a/scripting/scripting.cpp -+++ b/scripting/scripting.cpp -@@ -620,7 +620,6 @@ void KWin::Scripting::init() - qmlRegisterType("org.kde.kwin", 2, 0, "ClientModelByScreenAndDesktop"); - qmlRegisterType("org.kde.kwin", 2, 0, "ClientFilterModel"); - qmlRegisterType(); -- qmlRegisterType(); - qmlRegisterType(); - - m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("workspace"), m_workspaceWrapper); -diff --git a/scripts/desktopchangeosd/contents/ui/osd.qml b/scripts/desktopchangeosd/contents/ui/osd.qml -index fbf7dd7..e2ff86c 100644 ---- a/scripts/desktopchangeosd/contents/ui/osd.qml -+++ b/scripts/desktopchangeosd/contents/ui/osd.qml -@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License - along with this program. If not, see . - *********************************************************************/ - import QtQuick 2.0; -+import QtQuick.Window 2.0; - import org.kde.plasma.core 2.0 as PlasmaCore; - import org.kde.plasma.components 2.0 as Plasma; - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons;