ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Fixes minor cmake issues and status bar default color

Browse Source
This commit is contained in:
Eberhard Graether
2019-11-14 12:41:42 +01:00
parent 0e4a620768
commit 634e09ddfc
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -2
View File
@@ -525,10 +525,12 @@ configure_file(
#configure the versioning file #configure the versioning file
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/cmake/version.h.in ${CMAKE_SOURCE_DIR}/cmake/productVersion.h.in
${CMAKE_BINARY_DIR}/src/lib_gui/version.h ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h
) )
set_property(SOURCE ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h PROPERTY SKIP_AUTOMOC ON)
set(CMAKE_AUTOMOC OFF) set(CMAKE_AUTOMOC OFF)
cmake/version.cmake
-5
View File
@@ -48,8 +48,3 @@ message(STATUS "Version year: ${VERSION_YEAR}")
message(STATUS "Version minor: ${VERSION_MINOR}") message(STATUS "Version minor: ${VERSION_MINOR}")
message(STATUS "Version commit: ${VERSION_COMMIT}") message(STATUS "Version commit: ${VERSION_COMMIT}")
message(STATUS "Git commit time: ${GIT_COMMIT_TIME}") message(STATUS "Git commit time: ${GIT_COMMIT_TIME}")
configure_file(
${CMAKE_SOURCE_DIR}/cmake/productVersion.h.in
${BINARY_DIR}/src/lib_gui/productVersion.h
)
src/lib/CMakeLists.txt
+9 -2
View File
@@ -647,10 +647,17 @@ add_files(
utility/utilityLibrary.h utility/utilityLibrary.h
utility/utilityUuid.cpp utility/utilityUuid.cpp
utility/utilityUuid.h utility/utilityUuid.h
utility/utilityWindows.cpp
utility/utilityWindows.h
utility/utilityXml.cpp utility/utilityXml.cpp
utility/utilityXml.h utility/utilityXml.h
utility/Version.cpp utility/Version.cpp
utility/Version.h utility/Version.h
) )
if (WIN32)
add_files(
LIB
utility/utilityWindows.cpp
utility/utilityWindows.h
)
endif()
src/lib_gui/qt/element/QtStatusBar.cpp
+2 -2
View File
@@ -104,7 +104,7 @@ void QtStatusBar::setText(const std::wstring& text, bool isError, bool showLoade
} }
else else
{ {
m_text.setStyleSheet("QPushButton { color: #000000; margin-right: 0; spacing: none; text-align: left; }"); m_text.setStyleSheet("QPushButton { margin-right: 0; spacing: none; text-align: left; }");
} }
if (showLoader) if (showLoader)
@@ -137,7 +137,7 @@ void QtStatusBar::setErrorCount(ErrorCountInfo errorCount)
} }
else else
{ {
m_errorButton.setStyleSheet("QPushButton { color: #000000; margin-right: 0; spacing: none; }"); m_errorButton.setStyleSheet("QPushButton { margin-right: 0; spacing: none; }");
} }
m_errorButton.show(); m_errorButton.show();