Merge pull request #75 from matthewvogt/remove-qt4

Remove qt4 support
sailfishos · Feb 5, 2014 · 44f5f0e · 44f5f0e
2 parents a3c81b2 + 0f3788c
commit 44f5f0e
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 430 deletions.
diff --git a/config.pri b/config.pri
@@ -3,15 +3,4 @@ include(package.pri)
 CONFIG += qt link_pkgconfig
 QT -= gui
 
-equals(QT_MAJOR_VERSION, 4) {
-    CONFIG += mobility
-    MOBILITY += contacts versit
-    PKGCONFIG += qtcontacts-sqlite-extensions
-}
-equals(QT_MAJOR_VERSION, 5) {
-    PKGCONFIG += Qt5Contacts Qt5Versit qtcontacts-sqlite-qt5-extensions
-    DEFINES *= USING_QTPIM
-
-    # Needed for qt4 moc, which can't handle numeric tests
-    DEFINES *= QT_VERSION_5
-}
+PKGCONFIG += Qt5Contacts Qt5Versit qtcontacts-sqlite-qt5-extensions
diff --git a/package.pri b/package.pri
@@ -1,2 +1 @@
-equals(QT_MAJOR_VERSION, 4): PACKAGENAME=contactcache
-equals(QT_MAJOR_VERSION, 5): PACKAGENAME=contactcache-qt5
+PACKAGENAME=contactcache-qt5
diff --git a/rpm/libcontacts.spec b/rpm/libcontacts.spec