mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
Ubuntu 22.04 and GCC11 fixes (#2163)
* Update CEF version * Update Ghoul * Update SGCT * Update codegen * Remove warnings happening on Ubuntu 22.04 with GCC 11 * AppleClang warning fixes * Compile fix for Ubuntu and MacOS * Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
This commit is contained in:
@@ -48,8 +48,8 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows,
|
||||
std::array<QColor, 4> windowColors)
|
||||
{
|
||||
// Add all window controls (some will be hidden from GUI initially)
|
||||
for (unsigned int i = 0; i < nMaxWindows; ++i) {
|
||||
const unsigned int monitorNumForThisWindow = (nMaxWindows > 3 && i >= 2) ? 1 : 0;
|
||||
for (int i = 0; i < nMaxWindows; ++i) {
|
||||
const int monitorNumForThisWindow = (nMaxWindows > 3 && i >= 2) ? 1 : 0;
|
||||
|
||||
WindowControl* ctrl = new WindowControl(
|
||||
monitorNumForThisWindow,
|
||||
|
||||
@@ -183,7 +183,7 @@ void SgctEdit::save() {
|
||||
"window 2 has to be bigger than window 3 (if it exists), and window 3 has to "
|
||||
"be bigger than window 4.\nOtherwise, rendering errors might occur.\n\nAre "
|
||||
"you sure you want to continue?",
|
||||
QMessageBox::StandardButtons(QMessageBox::Yes || QMessageBox::No)
|
||||
QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No)
|
||||
);
|
||||
if (ret == QMessageBox::No) {
|
||||
return;
|
||||
|
||||
Submodule apps/OpenSpace/ext/sgct updated: 47167ca513...ad940a5c95
Reference in New Issue
Block a user