Merge pull request nemomobile#23 from thp/cleanups-2015-01-09

Remove Qt 4 support and other clean-ups

Author: thp

.gitignore

@@ -6,3 +6,4 @@ Makefile
 .moc
 .obj
 mnotificationmanagerproxy.*
+tools/mlitenotificationtool/mlitenotificationtool

build/.gitignore

@@ -20,8 +20,7 @@ defineTest(configure) {
     QMAKE_EXTRA_TARGETS += $${target}
 
     equals(TEMPLATE, subdirs) {
-        equals(QT_MAJOR_VERSION, 4): first = make_default
-        equals(QT_MAJOR_VERSION, 5): first = make_first
+        first = make_first
     } else {
         first = all
     }
@@ -38,15 +37,9 @@ defineTest(configure) {
     export(QMAKE_EXTRA_TARGETS)
 }
 
-# Use the following variables to differentiate build against Qt 4.x vs Qt 5.x
-# Example:
-#       TARGET = foo$${DASH_QT_VERSION}
-#       LIBS += -lbar$${DASH_QT_VERSION}
-equals(QT_MAJOR_VERSION, 4): DASH_QT_VERSION = ""
-equals(QT_MAJOR_VERSION, 5): DASH_QT_VERSION = "-qt5"
+DASH_QT_VERSION = "-qt5"
 CONFIG_SUBST += DASH_QT_VERSION
-equals(QT_MAJOR_VERSION, 4): NODASH_QT_VERSION = ""
-equals(QT_MAJOR_VERSION, 5): NODASH_QT_VERSION = "5"
+NODASH_QT_VERSION = "5"
 CONFIG_SUBST += NODASH_QT_VERSION
 
 }

common.pri

@@ -4,7 +4,6 @@ COVERAGE_EXCLUDES = \
     */*.moc \
     */qrc_*.cpp \
     /build/* \
-    /json/* \
     /tests/* \
     mnotificationmanagerproxy.h \
     mnotificationmanagerproxy.cpp \