diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,17 @@ include(ECMPoQmTools) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Qml Test) +find_package(KF5 REQUIRED COMPONENTS + AkonadiCalendar + AkonadiNotes + AkonadiSearch + IdentityManagement + KontactInterface + Ldap + Runner + Wallet +) +find_package(KF5Akonadi "5.1" CONFIG REQUIRED) find_package(Boost REQUIRED) macro(assert_min_ver version) set(error_msg "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION} not supported") @@ -32,7 +43,11 @@ endif() if(UNIX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "5.0.0.0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + endif() set(CMAKE_CXX_STANDARD 14) # Enable C++14, with cmake >= 3.1 set(CMAKE_CXX_EXTENSIONS OFF) # Don't enable gcc-specific extensions endif() @@ -61,18 +76,6 @@ 3rdparty/kdepim/libkdepim/ ) -find_package(KF5 REQUIRED COMPONENTS - AkonadiCalendar - AkonadiNotes - AkonadiSearch - IdentityManagement - KontactInterface - Ldap - Runner - Wallet -) -find_package(KF5Akonadi "5.1" CONFIG REQUIRED) - add_subdirectory(3rdparty) add_subdirectory(src) diff --git a/src/widgets/applicationcomponents.cpp b/src/widgets/applicationcomponents.cpp --- a/src/widgets/applicationcomponents.cpp +++ b/src/widgets/applicationcomponents.cpp @@ -112,7 +112,7 @@ ApplicationComponents *self = const_cast(this); self->m_availablePagesView = availablePagesView; - connect(self->m_availablePagesView, &AvailablePagesView::currentPageChanged, self, &ApplicationComponents::onCurrentPageChanged); + connect(self->m_availablePagesView.data(), &AvailablePagesView::currentPageChanged, self, &ApplicationComponents::onCurrentPageChanged); } return m_availablePagesView;