[PATCH 3 of 4] Fix administrator typo
Wald Commits
scm-commit at wald.intevation.org
Fri May 23 18:23:35 CEST 2014
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1400862026 0
# Node ID 2459a71225322c2c9dcb8ff45f51c4e5c905c413
# Parent 6c4fff1469994e339dc0a4bb71afd08eeec256a0
Fix administrator typo
diff -r 6c4fff146999 -r 2459a7122532 ui/CMakeLists.txt
--- a/ui/CMakeLists.txt Fri May 23 16:17:18 2014 +0000
+++ b/ui/CMakeLists.txt Fri May 23 16:20:26 2014 +0000
@@ -40,7 +40,7 @@
${DOWNLOADER_SOURCES}
)
-set(ADMINSTRATOR_SOURCES
+set(ADMINISTRATOR_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/administratorwindow.cpp
${CMAKE_CURRENT_SOURCE_DIR}/certificatetablemodel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/certificatetabledelegate.cpp
@@ -57,7 +57,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/certs.qrc
)
-set(ADMINSTRATOR_RESOURCES
+set(ADMINISTRATOR_RESOURCES
${CMAKE_CURRENT_SOURCE_DIR}/icons.qrc
)
@@ -107,8 +107,8 @@
set(TRUSTBRIDGE_MAIN_WITH_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
qt5_add_resources(TRUSTBRIDGE_MAIN_WITH_RESOURCES ${TRUSTBRIDGE_RESOURCES})
-set(ADMINSTRATOR_MAIN_WITH_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/administrator.cpp)
-qt5_add_resources(ADMINSTRATOR_MAIN_WITH_RESOURCES ${ADMINSTRATOR_RESOURCES})
+set(ADMINISTRATOR_MAIN_WITH_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/administrator.cpp)
+qt5_add_resources(ADMINISTRATOR_MAIN_WITH_RESOURCES ${ADMINISTRATOR_RESOURCES})
if(WIN32)
# This option causes cmake to use the appropiate liker flags to hide
@@ -123,11 +123,11 @@
# This would probably be better placed in a macro
configure_file(l10n/administrator.qrc.in administrator.qrc)
qt5_add_resources(ADMINISTRATOR_L10N ${CMAKE_CURRENT_BINARY_DIR}/administrator.qrc)
- qt5_create_translation(ADMINISTRATOR_TRANSLATION ${ADMINSTRATOR_SOURCES}
+ qt5_create_translation(ADMINISTRATOR_TRANSLATION ${ADMINISTRATOR_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/l10n/administrator_de_DE.ts)
add_executable(trustbridge-admin
${_add_executable_params}
- ${ADMINSTRATOR_MAIN_WITH_RESOURCES}
+ ${ADMINISTRATOR_MAIN_WITH_RESOURCES}
${ADMINISTRATOR_L10N}
${ADMINISTRATOR_TRANSLATION}
)
@@ -147,14 +147,14 @@
message (STATUS "WARNING: Could not find qt linguist tools. Translation will not be included.")
add_executable(trustbridge-admin
${_add_executable_params}
- ${ADMINSTRATOR_MAIN_WITH_RESOURCES})
+ ${ADMINISTRATOR_MAIN_WITH_RESOURCES})
add_executable(trustbridge
${_add_executable_params}
${TRUSTBRIDGE_MAIN_WITH_RESOURCES})
endif()
add_library(ui_common STATIC ${UICOMMON_SOURCES})
-add_library(tbadminlib STATIC ${ADMINSTRATOR_SOURCES})
+add_library(tbadminlib STATIC ${ADMINISTRATOR_SOURCES})
add_library(tblib STATIC ${TRUSTBRIDGE_SOURCES})
target_link_libraries(trustbridge-admin
More information about the Trustbridge-commits
mailing list