From e172ed0b33c85cb3f137b1983aa7ea8a303535bb Mon Sep 17 00:00:00 2001 From: Rusty Lynch Date: Tue, 12 Jun 2012 14:47:43 -0700 Subject: [PATCH] Porting to Qt5 --- libconnman-qt/libconnman-qt.pro | 4 +- packaging/connman-qt.changes | 3 ++ packaging/connman-qt.spec | 95 ++++++++++++----------------------------- plugin/components.cpp | 6 +-- plugin/components.h | 9 ++-- plugin/plugin.pro | 2 +- test/main.cpp | 22 ++++------ test/main.qml | 2 +- test/test.pro | 4 +- 9 files changed, 52 insertions(+), 95 deletions(-) diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro index bb746fe..ee821b3 100644 --- a/libconnman-qt/libconnman-qt.pro +++ b/libconnman-qt/libconnman-qt.pro @@ -5,7 +5,7 @@ VERSION=0.1.4 CONFIG += qt \ debug QT += dbus -TARGET = $$qtLibraryTarget(connman-qt4) +TARGET = $$qtLibraryTarget(connman-qt5) isEmpty(PREFIX) { PREFIX=/usr } @@ -31,7 +31,7 @@ CONFIG += create_pc create_prl QMAKE_PKGCONFIG_DESCRIPTION = Qt Connman Library QMAKE_PKGCONFIG_INCDIR = $$headers.path pkgconfig.path = $$INSTALL_ROOT$$PREFIX/lib/pkgconfig -pkgconfig.files = connman-qt4.pc +pkgconfig.files = connman-qt5.pc SOURCES += networkitem.cpp \ networklist.cpp \ diff --git a/packaging/connman-qt.changes b/packaging/connman-qt.changes index 23ffe7b..2626a56 100644 --- a/packaging/connman-qt.changes +++ b/packaging/connman-qt.changes @@ -1,3 +1,6 @@ +* Tue Jun 12 2012 - Rusty Lynch - 0.1.4 +- Porting to Qt5 + * Wed May 30 - Zhang Qiang - 0.1.4 - Clean up spec file for packaging diff --git a/packaging/connman-qt.spec b/packaging/connman-qt.spec index c175a4e..adc4955 100644 --- a/packaging/connman-qt.spec +++ b/packaging/connman-qt.spec @@ -1,11 +1,4 @@ -%define buildwayland 1 -%if %{buildwayland} -%define backend -wayland -%else -%define backend -xlib -%endif - -Name: connman-qt%{backend} +Name: connman-qt Summary: qt bindings for connman Version: 0.1.4 Release: 1 @@ -13,44 +6,43 @@ Group: System/GUI/Other License: Apache License URL: http://www.meego.com Source0: %{name}-%{version}.tar.bz2 -Requires: connman-qt%{backend}-declarative +Patch0: qt5-port.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig(QtCore%{backend}) -BuildRequires: pkgconfig(QtDBus%{backend}) -BuildRequires: pkgconfig(QtOpenGL%{backend}) -BuildRequires: pkgconfig(QtGui%{backend}) +BuildRequires: pkgconfig(QtQuick) +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtDBus) +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtQml) +BuildRequires: pkgconfig(QtV8) BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(egl) BuildRequires: doxygen %description This is a library for working with connman using Qt - - %package tests -Summary: tests for connman-qt +Summary: tests for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: connman-qt%{backend}-declarative %description tests This package contains the test applications for testing libconnman-qt %package declarative -Summary: Declarative plugin for Qt Quick for connman-qt +Summary: Declarative plugin for Qt Quick for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: connman-qt%{backend} %description declarative -This package contains the files necessary to develop -applications using libconnman-qt - +This package contains the connman QtQuick plugin %package devel -Summary: Development files for connman-qt +Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} @@ -58,78 +50,47 @@ Requires: %{name} = %{version}-%{release} This package contains the files necessary to develop applications using libconnman-qt - - %prep %setup -q -n %{name}-%{version} -# >> setup -# << setup +%patch0 -p1 %build -# >> build pre -export PATH=$PATH:/usr/lib/qt4/bin -qmake install_prefix=/usr -# << build pre -%qmake +export QTDIR=/usr/share/qt5 + +qmake install_prefix=/usr make %{?jobs:-j%jobs} -# >> build post -# << build post %install rm -rf %{buildroot} -# >> install pre -export INSTALL_ROOT=%{buildroot} -# << install pre -%qmake_install - -# >> install post -# << install post +make INSTALL_ROOT=%{buildroot} install +# remove mysterious extra pc file +rm %{buildroot}%{_libdir}/connman-qt5.pc %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - - - - - - - %files %defattr(-,root,root,-) -%{_libdir}/libconnman-qt4.so.* -# >> files -# << files - +%{_libdir}/*.so.* %files tests %defattr(-,root,root,-) -%{_usr}/lib/libconnman-qt4/test -# >> files tests -# << files tests +%{_usr}/lib/libconnman-qt5/test %files declarative %defattr(-,root,root,-) -%{_usr}/lib/qt4/imports/Connman/Qt -# >> files declarative -# << files declarative +%{_usr}/lib/qt5/imports/Connman/Qt %files devel %defattr(-,root,root,-) %{_usr}/include/connman-qt -%{_usr}/lib/pkgconfig/connman-qt4.pc -%{_usr}/lib/connman-qt4.pc -%{_usr}/lib/libconnman-qt4.prl -%{_usr}/lib/libconnman-qt4.so -# >> files devel -# << files devel +%{_usr}/lib/pkgconfig/* +%{_usr}/lib/*.prl +%{_usr}/lib/*.so diff --git a/plugin/components.cpp b/plugin/components.cpp index 4964d94..d3e0e9c 100644 --- a/plugin/components.cpp +++ b/plugin/components.cpp @@ -20,10 +20,8 @@ void Components::registerTypes(const char *uri) qmlRegisterType(uri,0,1,"ClockModel"); } -void Components::initializeEngine(QDeclarativeEngine *engine, const char *uri) +void Components::initializeEngine(QQmlEngine *engine, const char *uri) { - Q_UNUSED(uri); + Q_UNUSED(uri); Q_UNUSED(engine); } - -Q_EXPORT_PLUGIN(Components); diff --git a/plugin/components.h b/plugin/components.h index 5e3813b..edf6434 100644 --- a/plugin/components.h +++ b/plugin/components.h @@ -9,16 +9,17 @@ #ifndef COMPONENTS_H #define COMPONENTS_H -#include -#include +#include +#include +#include -class Components : public QDeclarativeExtensionPlugin +class Components : public QQmlExtensionPlugin { Q_OBJECT public: void registerTypes(const char *uri); - void initializeEngine(QDeclarativeEngine *engine, const char *uri); + void initializeEngine(QQmlEngine *engine, const char *uri); }; #endif // COMPONENTS_H diff --git a/plugin/plugin.pro b/plugin/plugin.pro index 93d73b2..b7b93be 100644 --- a/plugin/plugin.pro +++ b/plugin/plugin.pro @@ -6,7 +6,7 @@ SOURCES = components.cpp HEADERS = components.h INCLUDEPATH += ../libconnman-qt -LIBS += -L../libconnman-qt -lconnman-qt4 +LIBS += -L../libconnman-qt -lconnman-qt5 target.path = $$[QT_INSTALL_IMPORTS]/Connman/Qt qmldir.files += qmldir diff --git a/test/main.cpp b/test/main.cpp index 121a14d..1ef6143 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -1,19 +1,13 @@ -#include -#include -#include -#include -#include +#include +#include int main(int argc, char *argv[]) { - QApplication a(argc, argv); + QGuiApplication app(argc, argv); - QDeclarativeView *view = new QDeclarativeView; - - view->setSource(QUrl::fromLocalFile("main.qml")); - view->setGeometry(0,0,800,480); - view->setResizeMode(QDeclarativeView::SizeRootObjectToView); - view->show(); - - return a.exec(); + QQuickView view; + view.setResizeMode(QQuickView::SizeViewToRootObject); + view.setSource(QUrl::fromLocalFile("main.qml")); + view.show(); + return app.exec(); } diff --git a/test/main.qml b/test/main.qml index 0d71301..d9a8c0c 100644 --- a/test/main.qml +++ b/test/main.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 2.0 import MeeGo.Connman 0.1 Item { diff --git a/test/test.pro b/test/test.pro index c576b22..3cb317e 100644 --- a/test/test.pro +++ b/test/test.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core declarative gui +QT += core declarative gui quick TARGET = testconnman-qt CONFIG += console @@ -19,7 +19,7 @@ SOURCES += main.cpp HEADERS += -target.path = $$INSTALL_ROOT/usr/lib/libconnman-qt4/test +target.path = $$INSTALL_ROOT/usr/lib/libconnman-qt5/test qml.files = $$OTHER_FILES qml.path = $$target.path -- 2.7.4