diff --git a/cmake/LinuxPackage.cmake b/cmake/LinuxPackage.cmake index fa0f5d81..700c530f 100644 --- a/cmake/LinuxPackage.cmake +++ b/cmake/LinuxPackage.cmake @@ -6,14 +6,33 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/data DESTINATION share/coati/.config/coati PATTERN "log/*" EXCLUDE - PATTERN "projects/*" EXCLUDE + PATTERN "projects" EXCLUDE + PATTERN "src" EXCLUDE + PATTERN "ApplicationSettings.xml" EXCLUDE + PATTERN "ApplicationSettings_distr.xml" EXCLUDE + PATTERN "ProjectSettings_template.xml" EXCLUDE + PATTERN "ApplicationSettings_template.xml" EXCLUDE ) + +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/data/src/tictactoe + DESTINATION share/coati/.config/coati/data/projects + ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/projects/tictactoe.xml + DESTINATION share/coati/.config/coati/data/projects/tictactoe + ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/ApplicationSettings_distr.xml + DESTINATION share/coati/.config/coati/data + RENAME ApplicationSettings.xml) + INSTALL(FILES ${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop DESTINATION share/applications ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/gui/icon/logo_1024_1024.png DESTINATION share/icons RENAME coati.png) + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/setup/Linux/lib DESTINATION share/coati ) diff --git a/setup/Linux/findAndCopyLibraries.sh b/setup/Linux/findAndCopyLibraries.sh index d1dd7716..57e92cb4 100755 --- a/setup/Linux/findAndCopyLibraries.sh +++ b/setup/Linux/findAndCopyLibraries.sh @@ -1,3 +1,8 @@ #!/bin/sh mkdir -p setup/Linux/lib ldd bin/app/Release/Coati | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' setup/Linux/lib + +# extra files needed and not copied with the lines above +cp /usr/lib/qt/plugins/platforms/libqxcb.so setup/Linux +cp /usr/lib/libQt5XcbQpa.so.5 setup/Linux/lib +cp /usr/lib/libQt5DBus.so.5 setup/Linux/lib diff --git a/setup/Linux/libqxcb.so b/setup/Linux/libqxcb.so index 4d58a5b0..8af7d7de 100755 Binary files a/setup/Linux/libqxcb.so and b/setup/Linux/libqxcb.so differ diff --git a/src/lib/component/controller/UndoRedoController.cpp b/src/lib/component/controller/UndoRedoController.cpp index 1b09a61c..58bece15 100644 --- a/src/lib/component/controller/UndoRedoController.cpp +++ b/src/lib/component/controller/UndoRedoController.cpp @@ -8,8 +8,8 @@ #include "data/access/StorageAccess.h" UndoRedoController::UndoRedoController(StorageAccess* storageAccess) - : m_storageAccess(storageAccess) - , m_activationTranslator(storageAccess) + : m_activationTranslator(storageAccess) + , m_storageAccess(storageAccess) , m_lastCommand(nullptr, 0) { } diff --git a/src/lib/data/parser/cxx/CxxParser.cpp b/src/lib/data/parser/cxx/CxxParser.cpp index a67e71f9..6bb6678a 100644 --- a/src/lib/data/parser/cxx/CxxParser.cpp +++ b/src/lib/data/parser/cxx/CxxParser.cpp @@ -153,7 +153,7 @@ std::shared_ptr CxxParser::getCompilat clang::tooling::FixedCompilationDatabase::loadFromCommandLine(argc, argv) ); - delete argv; + delete[] argv; if (!compilationDatabase) {