← Back to branch summary

~aacid/unity8/fix_testDash

« back to all changes in this revision

Viewing changes to src/CMakeLists.txt

  • Committer: CI bot
  • Author(s): Albert Astals
  • Date: 2014-12-02 09:25:23 UTC
  • mfrom: (1368.18.5 networkingstatus)
  • Revision ID: ps-jenkins@lists.canonical.com-20141202092523-hn0fnsbeo7hselr9
Use ubuntu::connectivity::NetworkingStatus instead of QNetworkConfigurationManager

QNetworkConfigurationManager with the networkmanager plugin tracks lots of different things while we're only really interested in if we're connected or not that is exactly what ubuntu::connectivity::NetworkingStatus does 
Approved by: Andrea Cimitan

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/CMakeLists.txt
 
1
pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
 
2
 
1
3
include_directories(
2
4
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
3
5
    ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
 
6
    ${CONNECTIVITY_INCLUDE_DIRS}
4
7
)
5
8
 
6
9
file(GLOB_RECURSE QML_FILES
30
33
    target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
31
34
endif()
32
35
 
33
 
target_link_libraries(${SHELL_APP} UbuntuGestures)
 
36
target_link_libraries(${SHELL_APP} UbuntuGestures connectivity-qt1)
34
37
 
35
38
# For it to find libUbuntuGestures.so
36
39
set_target_properties(${SHELL_APP} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")