1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-07-09 12:52:13 +0000
3
+++ CMakeLists.txt	2013-07-09 20:39:24 +0000
4
@@ -19,9 +19,13 @@
5
19
pkg_search_module(HUD hud-2)
19
pkg_search_module(HUD hud-2)
6
20
if(${HUD_FOUND})
20
if(${HUD_FOUND})
7
21
  add_definitions( -DHAVE_HUD=1 )
21
  add_definitions( -DHAVE_HUD=1 )
8
22
else()
9
23
pkg_check_modules(GLIB2 REQUIRED glib-2.0)
10
24
pkg_check_modules(GOBJECT2 REQUIRED gobject-2.0)
11
25
pkg_check_modules(GIO2 REQUIRED gio-2.0)
12
22
endif()
26
endif()
13
23
27
15
24
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fno-permissive -pedantic -Wall -Wextra")
28
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -fpermissive -pedantic -Wall -Wextra")
16
25
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
29
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
17
26
30
18
27
if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
31
if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
19
@@ -61,12 +65,13 @@
20
61
add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
65
add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
21
62
                                       ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
66
                                       ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
22
63
find_package(Qt5Quick REQUIRED)
67
find_package(Qt5Quick REQUIRED)
23
68
include_directories(${Qt5Quick_INCLUDE_DIRS})
24
64
69
25
65
include_directories(include)
70
include_directories(include)
26
66
add_subdirectory(src)
71
add_subdirectory(src)
27
67
add_subdirectory(qml)
72
add_subdirectory(qml)
28
68
add_subdirectory(documentation)
73
add_subdirectory(documentation)
30
69
add_subdirectory(examples)
74
#add_subdirectory(examples)
31
70
75
32
71
find_program(qmltestrunner_exe qmltestrunner)
76
find_program(qmltestrunner_exe qmltestrunner)
33
72
77
34
73
78
35
=== modified file 'debian/control'
36
--- debian/control	2013-07-09 12:52:13 +0000
37
+++ debian/control	2013-07-09 20:39:24 +0000
38
@@ -15,6 +15,7 @@
39
15
 qtdeclarative5-dev-tools,
15
 qtdeclarative5-dev-tools,
40
16
 qtdeclarative5-qtquick2-plugin,
16
 qtdeclarative5-qtquick2-plugin,
41
17
 qtdeclarative5-test-plugin,
17
 qtdeclarative5-test-plugin,
42
18
 libglib2.0-dev,
43
18
 dbus-test-runner
19
 dbus-test-runner
44
19
Standards-Version: 3.9.2
20
Standards-Version: 3.9.2
45
20
Homepage: https://launchpad.net/unity-action-api
21
Homepage: https://launchpad.net/unity-action-api
46
21
22
47
=== modified file 'src/CMakeLists.txt'
48
--- src/CMakeLists.txt	2013-07-09 12:52:13 +0000
49
+++ src/CMakeLists.txt	2013-07-09 20:39:24 +0000
50
@@ -35,6 +35,11 @@
51
35
if(${HUD_FOUND})
35
if(${HUD_FOUND})
52
36
    include_directories(${HUD_INCLUDE_DIRS})
36
    include_directories(${HUD_INCLUDE_DIRS})
53
37
    target_link_libraries (unity-action-qt ${HUD_LIBRARIES})
37
    target_link_libraries (unity-action-qt ${HUD_LIBRARIES})
54
38
else()
55
39
    include_directories(${GLIB2_INCLUDE_DIRS})
56
40
    include_directories(${GOBJECT2_INCLUDE_DIRS})
57
41
    include_directories(${GIO2_INCLUDE_DIRS})
58
42
    target_link_libraries (unity-action-qt ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES} ${GIO2_LIBRARIES})
59
38
endif()
43
endif()
60
39
44
61
40
qt5_use_modules(unity-action-qt Core)
45
qt5_use_modules(unity-action-qt Core)
62
41
46
63
=== modified file 'src/unity-action-manager.cpp'
64
--- src/unity-action-manager.cpp	2013-07-09 12:52:13 +0000
65
+++ src/unity-action-manager.cpp	2013-07-09 20:39:24 +0000
66
@@ -294,6 +294,10 @@
67
294
    : QObject(parent),
294
    : QObject(parent),
68
295
      d(new Private(this))
295
      d(new Private(this))
69
296
{
296
{
70
297
#ifndef GLIB_VERSION_2_36
71
298
    g_type_init ();
72
299
#endif
73
300
74
297
    d->activeLocalContext = 0;
301
    d->activeLocalContext = 0;
75
298
    /*! \todo document me */
302
    /*! \todo document me */
76
299
#ifdef HAVE_HUD
303
#ifdef HAVE_HUD
77
300
304
78
=== modified file 'test/cpp/tst_actionmanager.cpp'
79
--- test/cpp/tst_actionmanager.cpp	2013-07-01 23:12:06 +0000
80
+++ test/cpp/tst_actionmanager.cpp	2013-07-09 20:39:24 +0000
81
@@ -35,6 +35,9 @@
82
35
TestActionManager::initTestCase()
35
TestActionManager::initTestCase()
83
36
{
36
{
84
37
    manager = new ActionManager(this);
37
    manager = new ActionManager(this);
85
38
#ifndef GLIB_VERSION_2_36
86
39
    g_type_init ();
87
40
#endif
88
38
    dbusc = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
41
    dbusc = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
89
39
    action_group = g_dbus_action_group_get(dbusc,
42
    action_group = g_dbus_action_group_get(dbusc,
90
40
                                           g_dbus_connection_get_unique_name(dbusc),
43
                                           g_dbus_connection_get_unique_name(dbusc),
Status:	Merged
Approved by:	Antti Kaijanmäki on 2013-07-09
Approved revision:	30
Merged at revision:	22
Proposed branch:	lp:~kaijanmaki/unity-action-api/fix_nohud_build
Merge into:	lp:~unity-team/unity-action-api/nohud
Diff against target:	90 lines (+20/-2) 5 files modified CMakeLists.txt (+7/-2) debian/control (+1/-0) src/CMakeLists.txt (+5/-0) src/unity-action-manager.cpp (+4/-0) test/cpp/tst_actionmanager.cpp (+3/-0)
To merge this branch:	bzr merge lp:~kaijanmaki/unity-action-api/fix_nohud_build
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-09
Unity Team		2013-07-09	Pending
Review via email: mp+173736@code.launchpad.net