diff options
| author | Michael Schuster <michael@schuster.ms> | 2020-03-01 08:47:46 +0300 |
|---|---|---|
| committer | Michael Schuster <michael@schuster.ms> | 2020-03-01 08:47:46 +0300 |
| commit | 712fef0cac6def8221c42f38b89be784e4d987ec (patch) | |
| tree | 95723fc2d27c7a707bcf021d60f86ec34f2e0076 /src/gui/CMakeLists.txt | |
| parent | 6593317afa50d6058b45a0afc501c9697a4a1db3 (diff) | |
| parent | 318c749558526395b25b68be5b86314e653cb010 (diff) | |
Merge branch 'master' into qml-singleton-style and fix merge conflict
Migrate changes in client.qrc to resources.qrc
Signed-off-by: Michael Schuster <michael@schuster.ms>
Diffstat (limited to 'src/gui/CMakeLists.txt')
| -rw-r--r-- | src/gui/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 872c2293e..7cf5fe9a7 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,12 +1,11 @@ project(gui) -find_package(Qt5 REQUIRED COMPONENTS Widgets Svg) +find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Qml Quick) set(CMAKE_AUTOMOC TRUE) set(CMAKE_AUTOUIC TRUE) set(CMAKE_AUTORCC TRUE) add_subdirectory(updater) -#TODO Move resources files -set(MIRALL_RC_SRC ../../client.qrc) +set(MIRALL_RC_SRC ../../resources.qrc) if (EXISTS "${OEM_THEME_DIR}/theme.qrc") list(APPEND MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc) set(theme_dir ${OEM_THEME_DIR}/theme) @@ -89,7 +88,7 @@ set(client_SRCS syncrunfilelog.cpp systray.cpp thumbnailjob.cpp - quotainfo.cpp + userinfo.cpp accountstate.cpp addcertificatedialog.cpp authenticationdialog.cpp @@ -310,7 +309,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) -target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml) +target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) target_link_libraries( ${APPLICATION_EXECUTABLE} updater ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) |