Merge lp:~aacid/unity/zdefssharedandmodule into lp:unity/phablet

[Albert Astals Cid]

Move the -zdefs definition to toplevel and make it applies to modules too

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:627
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/759/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/761
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/635
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/635/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1308

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/759/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

and the change to tests/qmltests/plugins/HudClient/fake_libhud_client.cpp ?

[Albert Astals Cid (aacid)]

Remove it and you'll see it doesn't link because of missing symbols (i.e. it is needed because of the -z defs)

[Andrea Cimitan (cimi)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-23 18:27:01 +0000
+++ CMakeLists.txt	2013-04-24 14:21:46 +0000
@@ -39,6 +39,10 @@
   ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
 endif()
 
+# Make sure we have all the needed symbols
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
+
 # Static C++ checks
 add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
                                        ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

=== modified file 'plugins/HudClient/CMakeLists.txt'
--- plugins/HudClient/CMakeLists.txt	2013-04-10 11:18:28 +0000
+++ plugins/HudClient/CMakeLists.txt	2013-04-24 14:21:46 +0000
@@ -6,8 +6,6 @@
 pkg_search_module(DEEQT libdee-qt5 REQUIRED)
 pkg_search_module(PULSE libpulse REQUIRED)
 
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${Qt5Core_INCLUDE_DIRS}

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2013-04-10 11:12:38 +0000
+++ plugins/Unity/CMakeLists.txt	2013-04-24 14:21:46 +0000
@@ -30,6 +30,7 @@
     ${QTDEE_LDFLAGS}
     ${UNITYCORE_LDFLAGS}
     ${Qt5DBus_LIBRARIES}
+    ${Qt5Gui_LIBRARIES}
     )
 
 qt5_use_modules(Unity-qml Qml)

=== modified file 'tests/qmltests/plugins/HudClient/CMakeLists.txt'
--- tests/qmltests/plugins/HudClient/CMakeLists.txt	2013-04-10 11:12:38 +0000
+++ tests/qmltests/plugins/HudClient/CMakeLists.txt	2013-04-24 14:21:46 +0000
@@ -9,8 +9,6 @@
 pkg_search_module(DEEQT libdee-qt5 REQUIRED)
 pkg_search_module(PULSE libpulse REQUIRED)
 
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${Qt5Core_INCLUDE_DIRS}

=== modified file 'tests/qmltests/plugins/HudClient/fake_libhud_client.cpp'
--- tests/qmltests/plugins/HudClient/fake_libhud_client.cpp	2013-03-22 15:46:41 +0000
+++ tests/qmltests/plugins/HudClient/fake_libhud_client.cpp	2013-04-24 14:21:46 +0000
@@ -170,6 +170,12 @@
     return NULL;
 }
 
+void hud_client_query_voice_query(HudClientQuery *cquery)
+{
+    Q_UNUSED(cquery);
+    // TODO We are not testing voice queries yet
+}
+
 GMenuModel *hud_client_param_get_model(HudClientParam *param)
 {
     Q_UNUSED(param);

=== modified file 'tests/qmltests/plugins/Ubuntu/ChewieUI/CMakeLists.txt'
--- tests/qmltests/plugins/Ubuntu/ChewieUI/CMakeLists.txt	2013-04-12 10:28:33 +0000
+++ tests/qmltests/plugins/Ubuntu/ChewieUI/CMakeLists.txt	2013-04-24 14:21:46 +0000
@@ -5,7 +5,6 @@
 find_package(Qt5Quick REQUIRED)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wextra -std=c++11")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'tests/qmltests/plugins/Unity/CMakeLists.txt'
--- tests/qmltests/plugins/Unity/CMakeLists.txt	2013-04-22 16:46:21 +0000
+++ tests/qmltests/plugins/Unity/CMakeLists.txt	2013-04-24 14:21:46 +0000
@@ -7,8 +7,6 @@
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
 pkg_search_module(DEEQT libdee-qt5 REQUIRED)
 
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${Qt5Core_INCLUDE_DIRS}