incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkorma...@apache.org
Subject [3/8] qt commit: Fixes for qt5 in notifications and main.cpp
Date Mon, 19 Mar 2012 12:01:23 GMT
Fixes for qt5 in notifications and main.cpp


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/commit/92b178b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/tree/92b178b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/diff/92b178b6

Branch: refs/heads/master
Commit: 92b178b63ec4d82b839032f829b3ac5fbca326a0
Parents: abb593a
Author: Denis Kormalev <dkormalev@ics.com>
Authored: Mon Mar 19 15:55:57 2012 +0400
Committer: Denis Kormalev <dkormalev@ics.com>
Committed: Mon Mar 19 15:55:57 2012 +0400

----------------------------------------------------------------------
 .gitignore                   |    2 +-
 cordovaqt.pro                |    1 +
 main.cpp                     |    6 ++++--
 src/plugins/notification.cpp |    7 ++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/92b178b6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 27e5f65..b86e5b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-cordovaqt.pro.user
+cordovaqt.pro.user*
 /qtc_packaging/debian_harmattan/*

http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/92b178b6/cordovaqt.pro
----------------------------------------------------------------------
diff --git a/cordovaqt.pro b/cordovaqt.pro
index 955e0b9..17e0295 100644
--- a/cordovaqt.pro
+++ b/cordovaqt.pro
@@ -46,6 +46,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT += feedback
     QT += systeminfo
     QT += contacts
+    QT += multimedia
     QT += quick declarative
 
     OTHER_FILES += qml/main_qt5.qml \

http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/92b178b6/main.cpp
----------------------------------------------------------------------
diff --git a/main.cpp b/main.cpp
index eaa9f28..81d6a8f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,13 +21,15 @@
 
 #if QT_VERSION < 0x050000
 # include <QDeclarativeView>
+# include <QDeclarativeContext>
+# include <QDeclarativeEngine>
 #else
 # include <QDeviceInfo>
 # include <QQuickView>
+# include <QQmlContext>
+# include <QQmlEngine>
 #endif
 
-#include <QDeclarativeContext>
-#include <QDeclarativeEngine>
 #include <qplatformdefs.h>
 
 #ifdef MEEGO_EDITION_HARMATTAN

http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/92b178b6/src/plugins/notification.cpp
----------------------------------------------------------------------
diff --git a/src/plugins/notification.cpp b/src/plugins/notification.cpp
index 23eda1e..e9bd385 100644
--- a/src/plugins/notification.cpp
+++ b/src/plugins/notification.cpp
@@ -20,7 +20,12 @@
 
 #include <QApplication>
 #include <QFeedbackHapticsEffect>
-#include <QtMultimediaKit/QMediaPlayer>
+
+#if QT_VERSION < 0x050000
+# include <QtMultimediaKit/QMediaPlayer>
+#else
+# include <QtMultimedia/QMediaPlayer>
+#endif
 #include <QDebug>
 
 #ifdef QTM_NAMESPACE


Mime
View raw message