[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=baaaa72

The following commit has been merged in the master branch:
commit baaaa7282de82fbe0cf072e2b6988dcbb16ef6f9
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Jan 3 16:58:44 2013 +0100

    import Qt 4.7 -> QtQuick 1.1
    
    Solves warning and lets us use more stuff.
    
    Kindly reviewed by dvratil and d_ed over IRC
---
 contact-applet/src/declarative/contents/ui/Avatar.qml       | 2 +-
 contact-applet/src/declarative/contents/ui/Contact.qml      | 2 +-
 contact-applet/src/declarative/contents/ui/DropDownMenu.qml | 2 +-
 contact-applet/src/declarative/contents/ui/main.qml         | 2 +-
 org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml  | 2 +-
 org.kde.ktp.contactlist/contents/ui/ContactList.qml         | 3 +--
 org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml       | 2 +-
 org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml | 2 +-
 org.kde.ktp.contactlist/contents/ui/main.qml                | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/contact-applet/src/declarative/contents/ui/Avatar.qml b/contact-applet/src/declarative/contents/ui/Avatar.qml
index 308fd0b..f716e7e 100644
--- a/contact-applet/src/declarative/contents/ui/Avatar.qml
+++ b/contact-applet/src/declarative/contents/ui/Avatar.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 
 Item {
diff --git a/contact-applet/src/declarative/contents/ui/Contact.qml b/contact-applet/src/declarative/contents/ui/Contact.qml
index a2c0218..9b4e8df 100644
--- a/contact-applet/src/declarative/contents/ui/Contact.qml
+++ b/contact-applet/src/declarative/contents/ui/Contact.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 
 Item {
     id: wrapper;
diff --git a/contact-applet/src/declarative/contents/ui/DropDownMenu.qml b/contact-applet/src/declarative/contents/ui/DropDownMenu.qml
index 313ffaa..fc59949 100644
--- a/contact-applet/src/declarative/contents/ui/DropDownMenu.qml
+++ b/contact-applet/src/declarative/contents/ui/DropDownMenu.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 
 Item {
diff --git a/contact-applet/src/declarative/contents/ui/main.qml b/contact-applet/src/declarative/contents/ui/main.qml
index 34d24ed..debb0ed 100644
--- a/contact-applet/src/declarative/contents/ui/main.qml
+++ b/contact-applet/src/declarative/contents/ui/main.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 
 Item {
     id: mainWidget;
diff --git a/org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml b/org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml
index 9148e08..fcec7a0 100644
--- a/org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml
@@ -22,7 +22,7 @@
   displays basic contact info when a contact is hovered over.
 */
 
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 
diff --git a/org.kde.ktp.contactlist/contents/ui/ContactList.qml b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
index efadd7c..6ac2c4c 100644
--- a/org.kde.ktp.contactlist/contents/ui/ContactList.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
@@ -17,8 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
-
+import QtQuick 1.1
 import org.kde.telepathy.contactlist 0.1 as KtpContactList
 import org.kde.plasma.components 0.1 as PlasmaComponents
 import org.kde.plasma.core 0.1 as PlasmaCore
diff --git a/org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml b/org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml
index 75dd58e..0022095 100644
--- a/org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 
diff --git a/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml b/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
index dcdf53c..8bf6418 100644
--- a/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.components 0.1 as PlasmaComponents
 import org.kde.qtextracomponents 0.1 as ExtraComponents
diff --git a/org.kde.ktp.contactlist/contents/ui/main.qml b/org.kde.ktp.contactlist/contents/ui/main.qml
index 98b639e..e974191 100644
--- a/org.kde.ktp.contactlist/contents/ui/main.qml
+++ b/org.kde.ktp.contactlist/contents/ui/main.qml
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.1
 
 Item {
     id: main;

-- 
ktp-contact-applet packaging