diff -Nru qtmir-0.4.8+15.04.20161024/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -161,12 +161,16 @@ add_definitions(-DQT_NO_KEYWORDS) # Tests -if (NOT NO_TESTS) +if (NO_TESTS) + message(STATUS "Tests disabled") +# glibc on Vivid+Overlay has a bug which causes LTTng-enabled tests to hang. It is hard to get the glibc version +# in cmake, so it is easier to check for the LTTng on V+O and gate on that instead. +elseif (LTTNG_VERSION VERSION_EQUAL 2.7.1) + message(STATUS "Tests disabled due to bug with glibc causing lttng to hang (lp:1618201)") +else() include(CTest) enable_testing() add_subdirectory(tests) -else() - message(STATUS "Tests disabled") endif() # add subdirectories to build diff -Nru qtmir-0.4.8+15.04.20161024/debian/changelog qtmir-0.5.0+15.04.20161123.3/debian/changelog --- qtmir-0.4.8+15.04.20161024/debian/changelog 2016-11-29 16:11:54.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/debian/changelog 2016-11-29 16:11:54.000000000 +0000 @@ -1,4 +1,18 @@ -qtmir (0.4.8+15.04.20161024-0ubuntu1) vivid; urgency=medium +qtmir (0.5.0+15.04.20161123.3-0ubuntu1) vivid; urgency=medium + + [ Albert Astals Cid ] + * Build with Qt 5.7 (LP: #1642608, #1642954) + + [ Gerry Boland ] + * Fix FTBFS due to new googletest framework release (1.8) + * Revert Lttng test-crash workaround from rev 557 + + [ Jonas G. Drange ] + * relax auth of clients to allow USS to set base mir display config + + -- Michał Sawicz Wed, 23 Nov 2016 20:46:06 +0000 + +qtmir (0.4.8+17.04.20161024-0ubuntu1) zesty; urgency=medium [ Andrea Bernabei ] * Add missing default return value to qImageFormatFromMirPixelFormat diff -Nru qtmir-0.4.8+15.04.20161024/debian/gles-patches/convert-to-gles.patch qtmir-0.5.0+15.04.20161123.3/debian/gles-patches/convert-to-gles.patch --- qtmir-0.4.8+15.04.20161024/debian/gles-patches/convert-to-gles.patch 2016-11-29 16:11:54.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/debian/gles-patches/convert-to-gles.patch 2016-11-29 16:11:54.000000000 +0000 @@ -115,7 +115,7 @@ =================================================================== --- inline-gles-quilt.orig/debian/rules +++ inline-gles-quilt/debian/rules -@@ -3,60 +3,28 @@ +@@ -3,66 +3,31 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 @@ -172,8 +172,14 @@ override_dh_install: -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) + cat $(CURDIR)/debian/qtmir-tests.install $(CURDIR)/debian/qtdeclarative5-qtmir-plugin.install | xargs -I% sh -c "rm -rf $(TMP1_DIR)/%" + #clean gmock/gtest if it built in our build dir + -rm -f $(TMP1_DIR)/usr/lib/libgmock*.a $(TMP1_DIR)/usr/lib/libgtest*.a + -rm -rf $(TMP1_DIR)/usr/include/gmock $(TMP1_DIR)/usr/include/gtest dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android -endif +- #clean gmock/gtest if it built in our build dir +- -rm -f $(TMP2_DIR)/usr/lib/libgmock*.a $(TMP2_DIR)/usr/lib/libgtest*.a +- -rm -rf $(TMP2_DIR)/usr/include/gmock $(TMP2_DIR)/usr/include/gtest - dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop - dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin - dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests diff -Nru qtmir-0.4.8+15.04.20161024/debian/rules qtmir-0.5.0+15.04.20161123.3/debian/rules --- qtmir-0.4.8+15.04.20161024/debian/rules 2016-11-29 16:11:54.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/debian/rules 2016-11-29 16:11:54.000000000 +0000 @@ -55,8 +55,14 @@ override_dh_install: ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) + #clean gmock/gtest if it built in our build dir + -rm -f $(TMP1_DIR)/usr/lib/libgmock*.a $(TMP1_DIR)/usr/lib/libgtest*.a + -rm -rf $(TMP1_DIR)/usr/include/gmock $(TMP1_DIR)/usr/include/gtest dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android endif + #clean gmock/gtest if it built in our build dir + -rm -f $(TMP2_DIR)/usr/lib/libgmock*.a $(TMP2_DIR)/usr/lib/libgtest*.a + -rm -rf $(TMP2_DIR)/usr/include/gmock $(TMP2_DIR)/usr/include/gtest dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests diff -Nru qtmir-0.4.8+15.04.20161024/src/platforms/mirserver/miropenglcontext.cpp qtmir-0.5.0+15.04.20161123.3/src/platforms/mirserver/miropenglcontext.cpp --- qtmir-0.4.8+15.04.20161024/src/platforms/mirserver/miropenglcontext.cpp 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/src/platforms/mirserver/miropenglcontext.cpp 2016-11-23 20:45:01.000000000 +0000 @@ -179,7 +179,14 @@ } } +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) QFunctionPointer MirOpenGLContext::getProcAddress(const QByteArray &procName) { return eglGetProcAddress(procName.constData()); } +#else +QFunctionPointer MirOpenGLContext::getProcAddress(const char *procName) +{ + return eglGetProcAddress(procName); +} +#endif diff -Nru qtmir-0.4.8+15.04.20161024/src/platforms/mirserver/miropenglcontext.h qtmir-0.5.0+15.04.20161123.3/src/platforms/mirserver/miropenglcontext.h --- qtmir-0.4.8+15.04.20161024/src/platforms/mirserver/miropenglcontext.h 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/src/platforms/mirserver/miropenglcontext.h 2016-11-23 20:45:01.000000000 +0000 @@ -44,7 +44,11 @@ bool isSharing() const override { return false; } +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) QFunctionPointer getProcAddress(const QByteArray &procName) override; +#else + QFunctionPointer getProcAddress(const char *procName) override; +#endif #ifdef QGL_DEBUG Q_SLOT void onGlDebugMessageLogged(QOpenGLDebugMessage m) { qDebug() << m; } diff -Nru qtmir-0.4.8+15.04.20161024/src/platforms/mirserver/sessionauthorizer.cpp qtmir-0.5.0+15.04.20161123.3/src/platforms/mirserver/sessionauthorizer.cpp --- qtmir-0.4.8+15.04.20161024/src/platforms/mirserver/sessionauthorizer.cpp 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/src/platforms/mirserver/sessionauthorizer.cpp 2016-11-23 20:44:52.000000000 +0000 @@ -96,5 +96,5 @@ //FIXME Actually mediate this access for clients Q_UNUSED(creds) - return false; + return true; } diff -Nru qtmir-0.4.8+15.04.20161024/tests/framework/gmock_fixes.h qtmir-0.5.0+15.04.20161123.3/tests/framework/gmock_fixes.h --- qtmir-0.4.8+15.04.20161024/tests/framework/gmock_fixes.h 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/framework/gmock_fixes.h 2016-11-23 20:44:29.000000000 +0000 @@ -60,6 +60,10 @@ return retval; } + std::unique_ptr Unwrap() { + return std::move(value_); + } + // Prints the held value as an action's result to os. virtual void PrintAsActionResult(::std::ostream* os) const { *os << "\n Returns: "; diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/mirserver/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/mirserver/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -4,114 +4,3 @@ add_subdirectory(Screen) add_subdirectory(ScreensModel) add_subdirectory(WindowManager) - - -##### -# What lies below was copied from src/platforms/mirserver/CMakeLists.txt with minor modifications -# (essentially stripping out the lttng-related parts) - -# Hacks for the QPA privates monster. -pkg_check_modules(FONTCONFIG fontconfig REQUIRED) -add_definitions(-DQ_FONTCONFIGDATABASE) - -# Dirty hack: The private QtPlatformSupport include dirs are not made available via -# a cmake module or the pkgconfig file (which only exposes the necessary linker flags) -# So we generate the paths ourselves from the Qt5Gui private dirs! -set(QT5_PLATFORMSUPPORT_INCLUDE_DIRS) -foreach(item ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) - set(newitem "") - string(REGEX REPLACE "QtGui" "QtPlatformSupport" newitem ${item}) - list(APPEND QT5_PLATFORMSUPPORT_INCLUDE_DIRS ${newitem}) -endforeach(item ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) - -include_directories( - ${CMAKE_SOURCE_DIR}/src/common - -) - -include_directories( - SYSTEM - ${MIRCOMMON_INCLUDE_DIRS} - ${MIRSERVER_INCLUDE_DIRS} - ${MIRRENDERERGLDEV_INCLUDE_DIRS} - - ${URL_DISPATCHER_INCLUDE_DIRS} - ${EGL_INCLUDE_DIRS} - ${LTTNG_INCLUDE_DIRS} - - ${QT5PLATFORM_SUPPORT_INCLUDE_DIRS} - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${QT5_PLATFORMSUPPORT_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - - ${APPLICATION_API_INCLUDE_DIRS} -) - -set(MIRSERVER_QPA_PLUGIN_SRC - ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp - ${CMAKE_SOURCE_DIR}/src/common/timestamp.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/cursor.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/logging.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mircursorimages.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mirwindowmanager.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mirsingleton.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/qteventfeeder.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/plugin.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/qmirserver.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/qmirserver_p.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/sessionauthorizer.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/sessionlistener.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/shelluuid.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/surfaceobserver.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/promptsessionlistener.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mirserver.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mirserverstatuslistener.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/screen.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/screenwindow.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/screenscontroller.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/screensmodel.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/mirserverintegration.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/miropenglcontext.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/nativeinterface.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/offscreensurface.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/qtcompositor.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/services.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/ubuntutheme.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/clipboard.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/creationhints.cpp - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver/eventbuilder.cpp -# We need to run moc on these headers - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h - ) - -add_library(qpa-mirserver-nolttng SHARED - ${MIRSERVER_QPA_PLUGIN_SRC} -) - -target_link_libraries( - qpa-mirserver-nolttng - Qt5PlatformSupport - - ${MIRSERVER_LDFLAGS} - ${MIRCLIENT_LDFLAGS} - ${URL_DISPATCHER_LDFLAGS} - ${EGL_LDFLAGS} - ${GL_LIBRARIES} - - ${QT5PLATFORM_SUPPORT_LDFLAGS} - # TODO Qt5Platform support LDFLAGS dont provide actual required ldflags... - # I found these were needed...perhaps there is some way to query qmake/qconfig? - -lfreetype - ${GIO_LDFLAGS} - ${FONTCONFIG_LDFLAGS} - ${XKBCOMMON_LIBRARIES} - - ${CONTENT_HUB_LIBRARIES} - - Qt5::Core - Qt5::DBus - Qt5::Quick - Qt5::Sensors -) diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/EventBuilder/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/mirserver/EventBuilder/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/mirserver/EventBuilder/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/EventBuilder/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -17,7 +17,7 @@ target_link_libraries( EventBuilderTest - qpa-mirserver-nolttng + qpa-mirserver ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} ) diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/QtEventFeeder/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/mirserver/QtEventFeeder/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/mirserver/QtEventFeeder/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/QtEventFeeder/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -19,7 +19,7 @@ target_link_libraries( QtEventFeederTest - qpa-mirserver-nolttng + qpa-mirserver ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} ) diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/Screen/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/mirserver/Screen/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/mirserver/Screen/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/Screen/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -20,7 +20,7 @@ target_link_libraries( ScreenTest - qpa-mirserver-nolttng + qpa-mirserver ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/Screen/screen_test.cpp qtmir-0.5.0+15.04.20161123.3/tests/mirserver/Screen/screen_test.cpp --- qtmir-0.4.8+15.04.20161024/tests/mirserver/Screen/screen_test.cpp 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/Screen/screen_test.cpp 2016-11-23 20:45:01.000000000 +0000 @@ -22,6 +22,8 @@ #include +#include + using namespace ::testing; namespace mg = mir::graphics; @@ -37,6 +39,12 @@ if (!qEnvironmentVariableIsSet("QT_ACCEL_FILEPATH")) { // Trick Qt >= 5.4.1 to load the generic sensors qputenv("QT_ACCEL_FILEPATH", "dummy"); + // Tell Qt >= 5.7 to use the generic orientation sensor + // since the proper linux one is not always running + // in test environments making the test fail + if (QSensorManager::isBackendRegistered("QOrientationSensor", "iio-sensor-proxy.orientationsensor")) { + QSensorManager::unregisterBackend("QOrientationSensor", "iio-sensor-proxy.orientationsensor"); + } } Screen::skipDBusRegistration = true; diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/ScreensModel/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/mirserver/ScreensModel/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/mirserver/ScreensModel/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/ScreensModel/CMakeLists.txt 2016-11-23 20:45:01.000000000 +0000 @@ -23,9 +23,11 @@ add_executable(ScreensModelTest ${SCREENCONTROLLER_TEST_SOURCES}) +set_property(TARGET ScreensModelTest PROPERTY CXX_STANDARD 14) + target_link_libraries( ScreensModelTest - qpa-mirserver-nolttng + qpa-mirserver -L${CMAKE_BINARY_DIR}/tests/framework qtmir-test-framework-static diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/tracepoints.h qtmir-0.5.0+15.04.20161123.3/tests/mirserver/tracepoints.h --- qtmir-0.4.8+15.04.20161024/tests/mirserver/tracepoints.h 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/tracepoints.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2016 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License version 3, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, - * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -#ifndef NOOP_TRACEPOINTS_H -#define NOOP_TRACEPOINTS_H - -#define tracepoint(a, ...) ((void)0) - -#endif // NOOP_TRACEPOINTS_H - diff -Nru qtmir-0.4.8+15.04.20161024/tests/mirserver/WindowManager/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/mirserver/WindowManager/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/mirserver/WindowManager/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/mirserver/WindowManager/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -18,7 +18,7 @@ Qt5::Test - qpa-mirserver-nolttng + qpa-mirserver ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/Application/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/modules/Application/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/modules/Application/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/Application/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -27,7 +27,7 @@ Qt5::Test - unityapplicationplugin-nolttng + unityapplicationplugin -L${CMAKE_BINARY_DIR}/tests/framework qtmir-test-framework-static diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/ApplicationManager/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/modules/ApplicationManager/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/modules/ApplicationManager/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/ApplicationManager/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -25,7 +25,7 @@ Qt5::Test - unityapplicationplugin-nolttng + unityapplicationplugin -L${CMAKE_BINARY_DIR}/tests/framework qtmir-test-framework-static diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/modules/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/modules/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -4,96 +4,3 @@ add_subdirectory(SharedWakelock) add_subdirectory(SessionManager) add_subdirectory(SurfaceManager) - -##### -# What lies below was copied from src/modules/Unity/Application/CMakeLists.txt with minor modifications -# (essentially stripping out the lttng-related parts) - -include_directories( - ${CMAKE_SOURCE_DIR}/src/platforms/mirserver - ${CMAKE_SOURCE_DIR}/src/common -) - -include_directories( - SYSTEM - ${GLIB_INCLUDE_DIRS} - ${GIO_INCLUDE_DIRS} - ${GIO_UNIX_INCLUDE_DIRS} - ${MIRSERVER_INCLUDE_DIRS} - ${MIRRENDERERGLDEV_INCLUDE_DIRS} - ${PROCESS_CPP_INCLUDE_DIRS} - ${UBUNTU_PLATFORM_API_INCLUDE_DIRS} - ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS} - ${GSETTINGS_QT_INCLUDE_DIRS} - ${CGMANAGER_INCLUDE_DIRS} - - ${LTTNG_INCLUDE_DIRS} - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${Qt5Qml_PRIVATE_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} -) - -set(QMLMIRPLUGIN_SRC - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/application_manager.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/application.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/cgmanager.cpp - ${CMAKE_SOURCE_DIR}/src/common/abstractdbusservicemonitor.cpp - ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/dbusfocusinfo.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/plugin.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirsurfacemanager.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirfocuscontroller.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirsurface.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirsurfaceinterface.h - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirsurfaceitem.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirsurfacelistmodel.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/mirbuffersgtexture.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/proc_info.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/session.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/sessionmanager.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/sharedwakelock.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/upstart/applicationinfo.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/upstart/taskcontroller.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/timer.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/timesource.cpp - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/settings.cpp -# We need to run moc on these headers - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirFocusControllerInterface.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h - ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h -# Feed the automoc monster - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/session_interface.h - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/applicationinfo.h - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/taskcontroller.h - ${CMAKE_SOURCE_DIR}/src/modules/Unity/Application/settings_interface.h - ) - -add_library(unityapplicationplugin-nolttng SHARED - ${QMLMIRPLUGIN_SRC} -) - -target_link_libraries( - unityapplicationplugin-nolttng - - ${CMAKE_THREAD_LIBS_INIT} - - ${GLIB_LDFLAGS} - ${UBUNTU_PLATFORM_API_LDFLAGS} - ${MIRSERVER_LDFLAGS} - ${PROCESS_CPP_LDFLAGS} - ${UBUNTU_APP_LAUNCH_LDFLAGS} - ${GSETTINGS_QT_LDFLAGS} - - ${GL_LIBRARIES} - - Qt5::Core - Qt5::DBus - Qt5::Qml - Qt5::Quick - - qpa-mirserver-nolttng -) diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/General/timestamp_test.cpp qtmir-0.5.0+15.04.20161123.3/tests/modules/General/timestamp_test.cpp --- qtmir-0.4.8+15.04.20161024/tests/modules/General/timestamp_test.cpp 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/General/timestamp_test.cpp 2016-11-23 20:44:29.000000000 +0000 @@ -72,7 +72,7 @@ compressedTimestamp = qtmir::compressTimestamp(timestamp); - EXPECT_EQ(0, compressedTimestamp.count()); + EXPECT_EQ(0u, compressedTimestamp.count()); // ensure the uncompression will yields the original timestamp EXPECT_EQ(qtmir::uncompressTimestamp(compressedTimestamp), timestamp); -} \ No newline at end of file +} diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/SessionManager/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/modules/SessionManager/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/modules/SessionManager/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/SessionManager/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -24,7 +24,7 @@ target_link_libraries( sessionmanager_test - unityapplicationplugin-nolttng + unityapplicationplugin Qt5::Test diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/SharedWakelock/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/modules/SharedWakelock/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/modules/SharedWakelock/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/SharedWakelock/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -18,7 +18,7 @@ target_link_libraries( sharedwakelock_test - unityapplicationplugin-nolttng + unityapplicationplugin Qt5::Test diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/SurfaceManager/CMakeLists.txt qtmir-0.5.0+15.04.20161123.3/tests/modules/SurfaceManager/CMakeLists.txt --- qtmir-0.4.8+15.04.20161024/tests/modules/SurfaceManager/CMakeLists.txt 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/SurfaceManager/CMakeLists.txt 2016-11-23 20:44:39.000000000 +0000 @@ -22,7 +22,7 @@ target_link_libraries( surfacemanager_test - unityapplicationplugin-nolttng + unityapplicationplugin Qt5::Test diff -Nru qtmir-0.4.8+15.04.20161024/tests/modules/tracepoints.h qtmir-0.5.0+15.04.20161123.3/tests/modules/tracepoints.h --- qtmir-0.4.8+15.04.20161024/tests/modules/tracepoints.h 2016-10-24 11:31:42.000000000 +0000 +++ qtmir-0.5.0+15.04.20161123.3/tests/modules/tracepoints.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2016 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License version 3, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, - * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -#ifndef NOOP_TRACEPOINTS_H -#define NOOP_TRACEPOINTS_H - -#define tracepoint(a, ...) ((void)0) - -#endif // NOOP_TRACEPOINTS_H - -