Merge branch 'stable-1.2'

# Conflicts:
#	cmake/modules/MinGWCrossCompile.cmake
#	plugins/FreeBoy/FreeBoy.cpp
This commit is contained in:
Hyunjin Song
2018-08-24 09:54:39 +09:00
6 changed files with 86 additions and 39 deletions

View File

@@ -158,6 +158,9 @@ GroupBox {
VisualizationWidget {
background: none;
border: none;
qproperty-normalColor: rgb(71, 253, 133);
qproperty-warningColor: rgb(255, 192, 64);
qproperty-clippingColor: rgb(255, 64, 64);
}
/* main toolbar cpu load widget - this can have transparent bg now */

View File

@@ -177,6 +177,9 @@ GroupBox {
VisualizationWidget {
background: none;
border: none;
qproperty-normalColor: rgb(71, 253, 133);
qproperty-warningColor: rgb(255, 192, 64);
qproperty-clippingColor: rgb(255, 64, 64);
}
/* main toolbar cpu load widget - this can have transparent bg now */