Fix build by replacing declarative keyworks with quick

diff --git a/packaging/connman-qt.changes b/packaging/connman-qt.changes
index 2626a56..6036dc7 100644 (file)
--- a/packaging/connman-qt.changes
+++ b/packaging/connman-qt.changes
@@ -1,3 +1,7 @@
+* Wed Jul 11 2012 - Rusty Lynch <rusty.lynch@intel.com> - 0.1.4
+- Fixing build for new snapshot of qtbase which has replaced the
+  'declarative' keyword with 'quick' for QT feature names
+
 * Tue Jun 12 2012 - Rusty Lynch <rusty.lynch@intel.com> - 0.1.4
 - Porting to Qt5
 

diff --git a/plugin/plugin.pro b/plugin/plugin.pro
index b7b93be..ffee3fb 100644 (file)
--- a/plugin/plugin.pro
+++ b/plugin/plugin.pro
@@ -1,6 +1,6 @@
 TARGET=ConnmanQtDeclarative
 TEMPLATE = lib
-QT += declarative dbus
+QT += quick dbus
 CONFIG += plugin
 SOURCES = components.cpp
 HEADERS = components.h

diff --git a/test/test.pro b/test/test.pro
index 3cb317e..2a6c19d 100644 (file)
--- a/test/test.pro
+++ b/test/test.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT += core declarative gui quick
+QT += core gui quick
 
 TARGET = testconnman-qt
 CONFIG   += console