From e55b88af2b8809c9d12edbe781e5b70bc4511669 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Fri, 19 Apr 2019 22:04:47 +0200 Subject: [PATCH] Removed cpp17 dependency and bumped webradioplugin --- plugins/webradioplugin | 2 +- zeiterfassungclient/CMakeLists.txt | 2 +- zeiterfassungguilib/projectsmodel.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/webradioplugin b/plugins/webradioplugin index 278bf02..4e6ff9a 160000 --- a/plugins/webradioplugin +++ b/plugins/webradioplugin @@ -1 +1 @@ -Subproject commit 278bf02e1eb169c98bdf4ab8f04a5381843304a9 +Subproject commit 4e6ff9a1939221349df3ac38168fecaa47e3be7c diff --git a/zeiterfassungclient/CMakeLists.txt b/zeiterfassungclient/CMakeLists.txt index f484d36..cb6174a 100644 --- a/zeiterfassungclient/CMakeLists.txt +++ b/zeiterfassungclient/CMakeLists.txt @@ -33,7 +33,7 @@ QT5_CREATE_TRANSLATION(TRANSLATIONS_C ${TRANSLATIONS} ${HEADERS} ${SOURCES} ${FO # TODO: add icon.ico for windows add_executable(zeiterfassungclient ${HEADERS} ${SOURCES} ${FORMS} ${RESOURCES} ${TRANSLATIONS_C}) -target_link_libraries(zeiterfassungclient Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib) +target_link_libraries(zeiterfassungclient stdc++ Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib) add_dependencies(zeiterfassung zeiterfassungclient) diff --git a/zeiterfassungguilib/projectsmodel.cpp b/zeiterfassungguilib/projectsmodel.cpp index 79aada3..4ac5c1d 100644 --- a/zeiterfassungguilib/projectsmodel.cpp +++ b/zeiterfassungguilib/projectsmodel.cpp @@ -154,7 +154,8 @@ void ProjectsModel::getProjectsFinished() for (const auto &item : m_getProjectsReply->items()) { const auto index = m_projects.size(); - auto &project = m_projects.emplace_back(item.label, item.value, m_api.doGetWorkpackages(m_userId, m_date, item.value)); + m_projects.emplace_back(item.label, item.value, m_api.doGetWorkpackages(m_userId, m_date, item.value)); + auto &project = m_projects.back(); connect(project.getWorkpackagesReply.get(), &ZeiterfassungReply::finished, this, [this,index](){ getWorkspacesFinished(index); }); } m_getProjectsReply = nullptr;