diff --git a/CMakeLists.txt b/CMakeLists.txt index 26b00d4..f832632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 3.12) project(DbSoftware) set(CMAKE_CXX_STANDARD 14) @@ -12,6 +12,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) +add_definitions(-DQT_DEPRECATED_WARNINGS) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +add_definitions(-DQT_MESSAGELOGCONTEXT) + find_package(Qt5Core CONFIG REQUIRED) find_package(Qt5Gui CONFIG REQUIRED) find_package(Qt5Widgets CONFIG REQUIRED) @@ -37,3 +41,33 @@ add_subdirectory(DbTictactoe) add_subdirectory(DbWebserver) add_subdirectory(DbZeiterfassung) add_subdirectory(libs) + +set(QT_TRANSLATIONS + qt_en.qm + qtbase_en.qm + qtmultimedia_en.qm + qtquick1_en.qm + qtscript_en.qm + qtxmlpatterns_en.qm + qt_de.qm + qtbase_de.qm + qtmultimedia_de.qm + qtquick1_de.qm + qtscript_de.qm + qtxmlpatterns_de.qm +) + +get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION) + +execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS + OUTPUT_VARIABLE QT_INSTALL_TRANSLATIONS + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +message(QT_INSTALL_TRANSLATIONS: ${QT_INSTALL_TRANSLATIONS}) + +list(TRANSFORM QT_TRANSLATIONS + PREPEND ${QT_INSTALL_TRANSLATIONS}/) + +file(COPY ${QT_TRANSLATIONS} + DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations) diff --git a/DbSerialServer b/DbSerialServer index 267ec95..af841fb 160000 --- a/DbSerialServer +++ b/DbSerialServer @@ -1 +1 @@ -Subproject commit 267ec959d40b63315c5209511957dc473f5f34ef +Subproject commit af841fbe051063a001214515ab2f494ba1b62825 diff --git a/DbWebserver b/DbWebserver index 3aa4e62..c661abe 160000 --- a/DbWebserver +++ b/DbWebserver @@ -1 +1 @@ -Subproject commit 3aa4e62896096187e4786556343b2d87fad3ec3b +Subproject commit c661abeada2381186786089d68b00009fe5fa05d diff --git a/DbZeiterfassung b/DbZeiterfassung index f982940..038f695 160000 --- a/DbZeiterfassung +++ b/DbZeiterfassung @@ -1 +1 @@ -Subproject commit f982940a7f1da86020d43ec0719b29a47755290d +Subproject commit 038f695887365872dac71bb9119060d2596c7752