Port to Qt5

diff --git a/mlite.pro b/mlite.pro
index f3417d2..f012f6e 100644 (file)
--- a/mlite.pro
+++ b/mlite.pro
@@ -1,9 +1,5 @@
 QT     = gui core dbus
-if (wayland) {
-    TARGET = $$qtLibraryTarget(mlite-wayland)
-} else {
-    TARGET = $$qtLibraryTarget(mlite-xlib)
-}
+TARGET = $$qtLibraryTarget(mlite)
 TEMPLATE = lib
 
 CONFIG += create_pc create_prl no_install_prl link_pkgconfig
@@ -39,20 +35,12 @@ INSTALL_HEADERS += \
        MGConfItem
 
 headers.files += $$INSTALL_HEADERS
-if (wayland) {
-    headers.path = $$INSTALL_ROOT/usr/include/mlite-wayland
-} else {
-    headers.path = $$INSTALL_ROOT/usr/include/mlite-xlib
-}
+headers.path = $$INSTALL_ROOT/usr/include/mlite
 
 QMAKE_PKGCONFIG_NAME = $$target.name
 QMAKE_PKGCONFIG_DESCRIPTION = mlite classes
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
-if (wayland) {
-    QMAKE_PKGCONFIG_INCDIR = $$headers.path
-} else {
-    QMAKE_PKGCONFIG_INCDIR = $$headers.path
-}
+QMAKE_PKGCONFIG_INCDIR = $$headers.path
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 
 target.path += $$[QT_INSTALL_LIBS]

diff --git a/packaging/mlite.changes b/packaging/mlite.changes
index caefdf4..2fd15f7 100644 (file)
--- a/packaging/mlite.changes
+++ b/packaging/mlite.changes
@@ -1,3 +1,6 @@
+* Wed Jun 12 2012 - Rusty Lynch <rusty.lynch@intel.com> - 0.1.2
+- Port to Qt5
+
 * Wed May 30 03:17:39 UTC 2012 - Lin Yang <lin.a.yang@intel.con> - 0.1.2
 - Clean up spec file for packaging
 

diff --git a/packaging/mlite.spec b/packaging/mlite.spec
index 4f9489c..9e544cd 100644 (file)
--- a/packaging/mlite.spec
+++ b/packaging/mlite.spec
@@ -1,24 +1,18 @@
-%define buildwayland 1 
-%if %{buildwayland}
-%define backend wayland
-%else
-%define backend xlib
-%endif
-
-Name:       mlite-%{backend}
+Name:       mlite
 Summary:    Touchscreen classes for UX-IVI support
 Version:    0.1.2
 Release:    1
 Group:      System/Libraries
 License:    LGPL v2.1
 URL:        http://www.tizen.org
-Source0:    %{name}-%{version}.tar.bz2
+Source0:    mlite-%{version}.tar.bz2
+Patch0:     remove-qt4-hack.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(QtCore-%{backend})
-BuildRequires:  pkgconfig(QtOpenGL-%{backend})
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(glesv2)
 
 %description
 Select set of useful classes to support touchscreen for UX-IVI support.
@@ -34,17 +28,21 @@ Development files needed for using the mlite library
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n mlite-%{version}
+
+%patch0 -p1
 
 %build
 
-%qmake CONFIG+=%{backend}
+export QTDIR=/usr/share/qt5
+
+qmake
 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-%qmake_install
+make INSTALL_ROOT=%{buildroot} install
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -55,7 +53,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-/usr/include/mlite-%{backend}
+/usr/include/mlite
 /usr/lib/pkgconfig/*.pc
 /usr/lib/*.so