mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 09:51:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/launcherconfigs

Browse Source
This commit is contained in:
Matthew Territo
2017-02-14 08:56:40 -07:00
parent fcbfeb86ee e3cfba8fec
commit bb4d89cfdf
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/Launcher/main.cpp
View File

@@ -83,14 +83,14 @@ QCheckBox::indicator {
}
QCheckBox::indicator::unchecked {
border: 1px solid #5A5A5A;
background: transparent;
background: #a10000;
}
QCheckBox::indicator:unchecked:hover {
border: 1px solid #DDDDDD;
}
QCheckBox::indicator::checked {
border: 1px solid #AAAAAA;
background: #666666;
border: 1px solid #5A5A5A;
background: #8dc73f;
}
QCheckBox::indicator:checked:hover {
border: 1px solid #DDDDDD;

2
ext/ghoul

Submodule ext/ghoul updated: 3ee30f00c1...6adcb40525

2
ext/sgct

Submodule ext/sgct updated: d47e9d6d1d...b3bf32e8bd

2
modules/kameleon/CMakeLists.txt
View File

@@ -63,7 +63,7 @@ create_new_module(
endif ()
set_property(TARGET ccmc PROPERTY FOLDER "External")
if (TARGET cdf)
if (OPENSPACE_DISABLE_EXTERNAL_WARNINGS)
if (GHOUL_DISABLE_EXTERNAL_WARNINGS)
if (MSVC)
target_compile_options(cdf PUBLIC "/W0" "/MP")
else ()