Merge branch 'jb38551' into 'master'

Properly link rpm package and .pc file versions

See merge request mer-core/lipstick!83

lipstick.pro

@@ -17,3 +17,5 @@ QMAKE_DISTCLEAN += \
     configure-stamp \
     *.log.xml \
     *.log
+
+OTHER_FILES += rpm/*

src/src.pro

@@ -9,14 +9,11 @@ system(qdbusxml2cpp -c ConnmanServiceProxy -p connmanserviceproxy net.connman.se
 TEMPLATE = lib
 TARGET = lipstick-qt5
 
-# Override the version from the spec file, we need .so version 1.0
-VERSION = 1.0
-
 DEFINES += LIPSTICK_BUILD_LIBRARY
 DEFINES += VERSION=\\\"$${VERSION}\\\"
 DEFINES += MESA_EGL_NO_X11_HEADERS
 
-CONFIG += qt wayland-scanner
+CONFIG += qt wayland-scanner c++11
 INSTALLS = target ts_install engineering_english_install
 target.path = $$[QT_INSTALL_LIBS]
 
@@ -181,8 +178,8 @@ QT += dbus xml qml quick sql gui gui-private sensors
 
 QMAKE_CXXFLAGS += \
     -Werror \
+    -Wfatal-errors \
     -g \
-    -std=c++0x \
     -fPIC \
     -fvisibility=hidden \
     -fvisibility-inlines-hidden
@@ -197,6 +194,7 @@ QMAKE_CLEAN += \
 
 CONFIG += create_pc create_prl
 QMAKE_PKGCONFIG_NAME = lib$$TARGET
+QMAKE_PKGCONFIG_VERSION = $$VERSION
 QMAKE_PKGCONFIG_DESCRIPTION = Library for creating QML desktops
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
 QMAKE_PKGCONFIG_INCDIR = $$publicheaderfiles.path