Merge lp:~thomas-voss/qtubuntu-sensors/cmake-setup-take-2 into lp:qtubuntu-sensors

[Thomas Voß]

Switch buildsystem to CMake.

Switch buildsystem to CMake.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/22/rebuild

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

A binary debdiff between current trunk and this branch looks fine:

$ debdiff qtubuntu-sensors_0.6+14.04.20140108.2-0ubuntu1_i386.trunk.deb qtubuntu-sensors_0.6+14.04.20140108.2-0ubuntu1_i386.deb
File lists identical (after any substitutions)

Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-81-] {+77+}

The important files (trunk first, then this MP):
-rw-r--r-- root/root 38648 2014-01-10 17:02 ./usr/lib/i386-linux-gnu/qt5/plugins/sensors/libqtubuntu_sensors_plugins.so
-rw-r--r-- root/root 34576 2014-01-10 17:09 ./usr/lib/i386-linux-gnu/qt5/plugins/sensors/libqtubuntu_sensors_plugins.so

-rw-r--r-- root/root 22236 2014-01-10 17:02 ./usr/lib/i386-linux-gnu/qt5/plugins/position/libqtposition_ubuntu.so
-rw-r--r-- root/root 22256 2014-01-10 17:09 ./usr/lib/i386-linux-gnu/qt5/plugins/position/libqtposition_ubuntu.so

-rw-r--r-- root/root 18060 2014-01-10 17:02 ./usr/lib/i386-linux-gnu/qt5/plugins/feedback/libqtfeedback_ubuntu.so
-rw-r--r-- root/root 18068 2014-01-10 17:09 ./usr/lib/i386-linux-gnu/qt5/plugins/feedback/libqtfeedback_ubuntu.so

Not sure why the cmake build of libqtubuntu_sensors_plugins.so got a bit smaller, but it still seems reasonable.

I ignored the bits in cmake/ as they are standard library snippets. Other review comments:

> -Werror -Wall

Is that standard policy for phone builds? This is often frowned upon in released software as it easily leads to build failures with newer compiler or Qt versions which generate more warnings or deprecate API; -Werror is useful for development builds, of course. Maybe that can be conditionalized?

+#enable_coverage_report(posix_process_test linux_process_test)

Out of interest, how does that work? Isn't that something that can be enabled/disabled at configure / cmake calling time? It seems nicer to support coverage and then provide a flag/option to not build with coverage, but for our integrated code+packaging trunks it would be nicer to add the lcov and other required build deps and provide a simple way to enable this without having to edit bzr-tracked source.

plugins/feedback/CMakeLists.txt (also occurs in other files):
+# Ideally, we would read the plugin installation location from cmake

Is that supposed to mean s/cmake/pkg-config/ ?

Otherwise it looks fine to me, thanks!

review: Needs Information

[lp:~thomas-voss/qtubuntu-sensors/cmake-setup-take-2]

56. By Thomas Voß on 2014-01-10

Remove unnecessary cmake subfolder
Remove coverage-specific setup until we have tests.

[Thomas Voß (thomas-voss)]

> A binary debdiff between current trunk and this branch looks fine:
>
> $ debdiff qtubuntu-sensors_0.6+14.04.20140108.2-0ubuntu1_i386.trunk.deb
> qtubuntu-sensors_0.6+14.04.20140108.2-0ubuntu1_i386.deb
> File lists identical (after any substitutions)
>
> Control files: lines which differ (wdiff format)
> ------------------------------------------------
> Installed-Size: [-81-] {+77+}
>
> The important files (trunk first, then this MP):
> -rw-r--r-- root/root 38648 2014-01-10 17:02 ./usr/lib/i386-linux-
> gnu/qt5/plugins/sensors/libqtubuntu_sensors_plugins.so
> -rw-r--r-- root/root 34576 2014-01-10 17:09 ./usr/lib/i386-linux-
> gnu/qt5/plugins/sensors/libqtubuntu_sensors_plugins.so
>
> -rw-r--r-- root/root 22236 2014-01-10 17:02 ./usr/lib/i386-linux-
> gnu/qt5/plugins/position/libqtposition_ubuntu.so
> -rw-r--r-- root/root 22256 2014-01-10 17:09 ./usr/lib/i386-linux-
> gnu/qt5/plugins/position/libqtposition_ubuntu.so
>
> -rw-r--r-- root/root 18060 2014-01-10 17:02 ./usr/lib/i386-linux-
> gnu/qt5/plugins/feedback/libqtfeedback_ubuntu.so
> -rw-r--r-- root/root 18068 2014-01-10 17:09 ./usr/lib/i386-linux-
> gnu/qt5/plugins/feedback/libqtfeedback_ubuntu.so
>
> Not sure why the cmake build of libqtubuntu_sensors_plugins.so got a bit
> smaller, but it still seems reasonable.
>
> I ignored the bits in cmake/ as they are standard library snippets. Other
> review comments:
>
> > -Werror -Wall
>
> Is that standard policy for phone builds? This is often frowned upon in
> released software as it easily leads to build failures with newer compiler or
> Qt versions which generate more warnings or deprecate API; -Werror is useful
> for development builds, of course. Maybe that can be conditionalized?

We enable that by default for phone builds, yes. We condition in -Werror only for release builds usually (see latest update to this mp).

>
> +#enable_coverage_report(posix_process_test linux_process_test)
>
> Out of interest, how does that work? Isn't that something that can be
> enabled/disabled at configure / cmake calling time? It seems nicer to support
> coverage and then provide a flag/option to not build with coverage, but for
> our integrated code+packaging trunks it would be nicer to add the lcov and
> other required build deps and provide a simple way to enable this without
> having to edit bzr-tracked source.
>

Fair, I will propose a follow-up MP that bundles all of that functionality together in an external cmake component. Removed coverage-specific setup for now.

> plugins/feedback/CMakeLists.txt (also occurs in other files):
> +# Ideally, we would read the plugin installation location from cmake
>
> Is that supposed to mean s/cmake/pkg-config/ ?
>
> Otherwise it looks fine to me, thanks!

No, qt5's cmake setup should provide that information but it does not at the moment. We would need to query the qmake executable to get the information and I decided for the slightly less clean but more pragmatic way of just writing down the path.

[lp:~thomas-voss/qtubuntu-sensors/cmake-setup-take-2]

57. By Thomas Voß on 2014-01-10

Remove obsolete coverage flags.

[Martin Pitt (pitti)]

I didn't want to imply that the coverage scripts should go away, but having them in a central cmake library package indeed sounds better.

Looks fine, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/25/rebuild

review: Approve (continuous-integration)

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-01-10 16:55:19 +0000
@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(qtubuntu-sensors)
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+include(GNUInstallDirs)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -fPIC -fvisibility=hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+
+option(QTUBUNTU_SENSORS_WERROR "Treat warnings as errors" ON)
+if (QTUBUNTU_SENSORS_WERROR)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif(QTUBUNTU_SENSORS_WERROR)
+
+include(CTest)
+
+find_package(Threads REQUIRED)
+
+add_definitions(-DQT_PLUGIN)
+
+add_subdirectory(plugins)

=== removed file 'coverage.pri'
--- coverage.pri	2013-01-10 19:45:23 +0000
+++ coverage.pri	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# Coverage
-CONFIG(coverage) {
-    OBJECTS_DIR =
-    MOC_DIR =
-    TOP_SRC_DIR = $$PWD
-
-    LIBS += -lgcov
-    QMAKE_CXXFLAGS += --coverage
-    QMAKE_LDFLAGS += --coverage
-
-    QMAKE_EXTRA_TARGETS += coverage cov
-    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
-        generate-coverage-html clean-coverage-html coverage-gcovr \
-        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-    clean-gcno.commands = \
-        "@echo Removing old coverage instrumentation"; \
-        "find -name '*.gcno' -print | xargs -r rm"
-
-    clean-gcda.commands = \
-        "@echo Removing old coverage results"; \
-        "find -name '*.gcda' -print | xargs -r rm"
-  
-    coverage-html.depends = clean-gcda check generate-coverage-html
-  
-    generate-coverage-html.commands = \
-        "@echo Collecting coverage data"; \
-        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
-        "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
-        "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
-        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
-  
-    clean-coverage-html.depends = clean-gcda
-    clean-coverage-html.commands = \
-        "lcov --directory $${TOP_SRC_DIR} -z"; \
-        "rm -rf coverage.info coverage-html"
-
-    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
-
-    generate-coverage-gcovr.commands = \
-        "@echo Generating coverage GCOVR report"; \
-        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"unittests/.*\" -e \".*\\.h\""
-
-    clean-coverage-gcovr.depends = clean-gcda
-    clean-coverage-gcovr.commands = \
-        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
-
-    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
-}

=== modified file 'debian/control'
--- debian/control	2014-01-09 17:42:48 +0000
+++ debian/control	2014-01-10 16:55:19 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               cmake,
                libplatform-api1-dev,
                pkg-config,
                qt5-default,

=== modified file 'debian/rules'
--- debian/rules	2013-03-18 11:58:01 +0000
+++ debian/rules	2014-01-10 16:55:19 +0000
@@ -8,7 +8,7 @@
 export QT_QPA_PLATFORM = minimal
 
 %:
-	dh $@ --parallel --buildsystem=qmake
+	dh $@ --parallel
 
 override_dh_install:
 	dh_install --fail-missing

=== added file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/CMakeLists.txt	2014-01-10 16:55:19 +0000
@@ -0,0 +1,3 @@
+add_subdirectory(feedback)
+add_subdirectory(position)
+add_subdirectory(sensors)
\ No newline at end of file

=== added file 'plugins/feedback/CMakeLists.txt'
--- plugins/feedback/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/feedback/CMakeLists.txt	2014-01-10 16:55:19 +0000
@@ -0,0 +1,36 @@
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Feedback REQUIRED)
+
+qt5_add_resources(FEEDBACK_RESOURCES feedback.qrc)
+
+add_library(
+  qtfeedback_ubuntu SHARED
+
+  core_feedback.h
+  core_feedback.cpp
+
+  ${FEEDBACK_RESOURCES}
+)
+
+# Ideally, we would read the plugin installation location from cmake
+# but this does not work currently.
+set(PLUGIN_INSTALL_LOCATION "${CMAKE_INSTALL_LIBDIR}/qt5/plugins/feedback")
+# get_target_property(PLUGIN_LOCATION Qt5::Feedback PLUGIN_LOCATION)
+
+message(STATUS "Installing Qt5 feedback plugin to: ${PLUGIN_INSTALL_LOCATION}")
+
+qt5_use_modules(qtfeedback_ubuntu Core Feedback)
+
+target_link_libraries(
+  qtfeedback_ubuntu
+
+  ${CMAKE_THREAD_LIBS_INIT}
+
+  Qt5::Core
+  Qt5::Feedback)
+
+install(
+  TARGETS qtfeedback_ubuntu
+  LIBRARY DESTINATION ${PLUGIN_INSTALL_LOCATION})
+
+

=== removed file 'plugins/feedback/feedback.pro'
--- plugins/feedback/feedback.pro	2014-01-07 10:35:49 +0000
+++ plugins/feedback/feedback.pro	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-include(../../coverage.pri)
-
-TEMPLATE = lib
-CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtfeedback_ubuntu)
-PLUGIN_TYPE = feedback
-
-QT = core feedback
-
-HEADERS += core_feedback.h
-SOURCES += core_feedback.cpp
-
-target.path += $$[QT_INSTALL_PLUGINS]/feedback
-INSTALLS += target
-
-OTHER_FILES += feedback.json
-
-QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]/qtubuntu-feedback

=== added file 'plugins/feedback/feedback.qrc'
--- plugins/feedback/feedback.qrc	1970-01-01 00:00:00 +0000
+++ plugins/feedback/feedback.qrc	2014-01-10 16:55:19 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+<qresource>
+    <file>feedback.json</file>
+</qresource>
+</RCC>
\ No newline at end of file

=== removed file 'plugins/plugins.pro'
--- plugins/plugins.pro	2014-01-07 17:29:45 +0000
+++ plugins/plugins.pro	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    feedback \
-    position \
-    sensors 

=== added file 'plugins/position/CMakeLists.txt'
--- plugins/position/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/position/CMakeLists.txt	2014-01-10 16:55:19 +0000
@@ -0,0 +1,44 @@
+find_package(PkgConfig)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Location REQUIRED)
+
+pkg_check_modules(UBUNTU_PLATFORM_API ubuntu-platform-api REQUIRED)
+
+qt5_add_resources(POSITION_RESOURCES position.qrc)
+
+add_library(
+  qtposition_ubuntu SHARED
+
+  core_geo_position_info_source.h
+  core_geo_position_info_source_factory.h
+
+  core_geo_position_info_source.cpp
+  core_geo_position_info_source_factory.cpp
+
+  ${POSITION_RESOURCES}
+)
+
+# Ideally, we would read the plugin installation location from cmake
+# but this does not work currently.
+set(PLUGIN_INSTALL_LOCATION "${CMAKE_INSTALL_LIBDIR}/qt5/plugins/position")
+# get_target_property(PLUGIN_LOCATION Qt5::Location PLUGIN_LOCATION)
+
+message(STATUS "Installing Qt5 location plugin to: ${PLUGIN_INSTALL_LOCATION}")
+
+qt5_use_modules(qtposition_ubuntu Core Location)
+
+target_link_libraries(
+  qtposition_ubuntu
+
+  ${CMAKE_THREAD_LIBS_INIT}
+
+  Qt5::Core 
+  Qt5::Location
+
+  ${UBUNTU_PLATFORM_API_LIBRARIES}
+)
+
+install(
+  TARGETS qtposition_ubuntu
+  LIBRARY DESTINATION ${PLUGIN_INSTALL_LOCATION})

=== removed file 'plugins/position/position.pro'
--- plugins/position/position.pro	2014-01-07 17:49:57 +0000
+++ plugins/position/position.pro	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-QT += location core
-
-TEMPLATE = lib
-CONFIG += link_pkgconfig plugin
-TARGET = $$qtLibraryTarget(qtposition_ubuntu)
-PLUGIN_TYPE = position
-
-QT = location core
-
-HEADERS += \
-    core_geo_position_info_source.h \
-    core_geo_position_info_source_factory.h
-
-SOURCES += \
-    core_geo_position_info_source.cpp \
-    core_geo_position_info_source_factory.cpp
-
-INCLUDEPATH += $$PWD/
-
-PKGCONFIG += ubuntu-platform-api
-LIBS += -lubuntu_application_api
-
-target.path += $$[QT_INSTALL_PLUGINS]/position
-INSTALLS += target
-
-OTHER_FILES += plugin.json

=== added file 'plugins/position/position.qrc'
--- plugins/position/position.qrc	1970-01-01 00:00:00 +0000
+++ plugins/position/position.qrc	2014-01-10 16:55:19 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+<qresource>
+    <file>plugin.json</file>
+</qresource>
+</RCC>
\ No newline at end of file

=== added file 'plugins/sensors/CMakeLists.txt'
--- plugins/sensors/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/sensors/CMakeLists.txt	2014-01-10 16:55:19 +0000
@@ -0,0 +1,46 @@
+find_package(PkgConfig)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Sensors REQUIRED)
+
+pkg_check_modules(UBUNTU_PLATFORM_API ubuntu-platform-api REQUIRED)
+
+qt5_add_resources(SENSORS_RESOURCES sensors.qrc)
+
+add_library(
+  qtubuntu_sensors_plugins SHARED
+
+  core_accelerometer.h
+  core_orientation_sensor.h
+  core_sensor_plugins.h
+  core_shared_accelerometer.h
+
+  core_accelerometer.cpp
+  core_orientation_sensor.cpp
+  core_sensor_plugins.cpp
+  core_shared_accelerometer.cpp
+
+  ${SENSORS_RESOURCES}
+)
+
+# Ideally, we would read the plugin installation location from cmake
+# but this does not work currently.
+set(PLUGIN_INSTALL_LOCATION "${CMAKE_INSTALL_LIBDIR}/qt5/plugins/sensors")
+# get_target_property(PLUGIN_LOCATION Qt5::Sensors PLUGIN_LOCATION)
+
+message(STATUS "Installing Qt5 sensors plugin to: ${PLUGIN_INSTALL_LOCATION}")
+
+qt5_use_modules(qtubuntu_sensors_plugins Core Sensors)
+
+target_link_libraries(
+  qtubuntu_sensors_plugins 
+
+  ${CMAKE_THREAD_LIBS_INIT}
+
+  Qt5::Core 
+  Qt5::Sensors
+
+  ${UBUNTU_PLATFORM_API_LIBRARIES})
+
+install(
+  TARGETS qtubuntu_sensors_plugins
+  LIBRARY DESTINATION ${PLUGIN_INSTALL_LOCATION})

=== modified file 'plugins/sensors/core_shared_accelerometer.cpp'
--- plugins/sensors/core_shared_accelerometer.cpp	2014-01-07 07:50:47 +0000
+++ plugins/sensors/core_shared_accelerometer.cpp	2014-01-10 16:55:19 +0000
@@ -19,6 +19,8 @@
 #include <QDebug>
 #include <QMetaType>
 
+Q_DECLARE_METATYPE(QSharedPointer<QAccelerometerReading>)
+
 core::SharedAccelerometer& core::SharedAccelerometer::instance()
 {
     static core::SharedAccelerometer instance;

=== modified file 'plugins/sensors/core_shared_accelerometer.h'
--- plugins/sensors/core_shared_accelerometer.h	2014-01-07 07:26:33 +0000
+++ plugins/sensors/core_shared_accelerometer.h	2014-01-10 16:55:19 +0000
@@ -23,8 +23,6 @@
 #include <QObject>
 #include <QSharedPointer>
 
-Q_DECLARE_METATYPE(QSharedPointer<QAccelerometerReading>)
-
 namespace core
 {
 class SharedAccelerometer : public QObject

=== removed file 'plugins/sensors/sensors.pro'
--- plugins/sensors/sensors.pro	2014-01-07 10:35:49 +0000
+++ plugins/sensors/sensors.pro	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-include(../../coverage.pri)
-
-TEMPLATE = lib
-CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtubuntu_sensors_plugins)
-PLUGIN_TYPE = sensors
-
-QT = sensors core
-
-INCLUDEPATH += $$PWD/
-
-LIBS += -L$$OUT_PWD/
-LIBS += -lubuntu_application_api
-
-HEADERS += \
-    core_accelerometer.h \
-    core_orientation_sensor.h \
-    core_sensor_plugins.h \
-    core_shared_accelerometer.h
-
-SOURCES += \
-    core_accelerometer.cpp \
-    core_orientation_sensor.cpp \
-    core_sensor_plugins.cpp \
-    core_shared_accelerometer.cpp
-
-target.path += $$[QT_INSTALL_PLUGINS]/sensors
-INSTALLS += target
-
-OTHER_FILES += sensors.json
-
-QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]/qtubuntu-sensors

=== added file 'plugins/sensors/sensors.qrc'
--- plugins/sensors/sensors.qrc	1970-01-01 00:00:00 +0000
+++ plugins/sensors/sensors.qrc	2014-01-10 16:55:19 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+<qresource>
+    <file>sensors.json</file>
+</qresource>
+</RCC>
\ No newline at end of file

=== removed file 'qtubuntu-sensors.pro'
--- qtubuntu-sensors.pro	2014-01-07 10:35:49 +0000
+++ qtubuntu-sensors.pro	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-include(coverage.pri)
-
-TEMPLATE = subdirs
-
-SUBDIRS += plugins