shift to Qt 5.15.0 minimum

MesserLab · Aug 19, 2024 · 543c65f · 543c65f
1 parent f66cce0
commit 543c65f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/QtSLiM/QtSLiM.pro b/QtSLiM/QtSLiM.pro
@@ -42,7 +42,7 @@ DEFINES += GIT_SHA1=$$GIT_HASH
 
 # Warn and error on usage of deprecated Qt APIs; see also -Wno-deprecated-declarations below
 # DEFINES += QT_DEPRECATED_WARNINGS					# uncomment this to get warnings about deprecated APIs
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900    # disables all the APIs deprecated before Qt 5.9.0
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00    # disables all the APIs deprecated before Qt 5.15.0
 
 
 # Bring in flag settings from the environment; see https://stackoverflow.com/a/17578151/2752221

diff --git a/QtSLiM/QtSLiMAppDelegate.cpp b/QtSLiM/QtSLiMAppDelegate.cpp
@@ -1205,7 +1205,7 @@ QWidget *QtSLiMAppDelegate::globalImageWindowWithPath(const QString &path, const
     QVBoxLayout *topLayout = new QVBoxLayout;
 
     image_window->setLayout(topLayout);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     topLayout->setSpacing(0);
     topLayout->addWidget(imageView);
 

diff --git a/QtSLiM/QtSLiMDebugOutputWindow.cpp b/QtSLiM/QtSLiMDebugOutputWindow.cpp
@@ -100,7 +100,7 @@ QtSLiMDebugOutputWindow::QtSLiMDebugOutputWindow(QtSLiMWindow *p_parent) :
 
     // fix the layout of the window
     ui->outputHeaderLayout->setSpacing(4);
-    ui->outputHeaderLayout->setMargin(0);
+    ui->outputHeaderLayout->setContentsMargins(0, 0, 0, 0);
 
     // QtSLiMTextEdit attributes
     ui->debugOutputTextEdit->setOptionClickEnabled(false);

diff --git a/QtSLiM/QtSLiMHaplotypeManager.cpp b/QtSLiM/QtSLiMHaplotypeManager.cpp
@@ -83,7 +83,7 @@ void QtSLiMHaplotypeManager::CreateHaplotypePlot(QtSLiMWindow *controller)
             QVBoxLayout *topLayout = new QVBoxLayout;
 
             window->setLayout(topLayout);
-            topLayout->setMargin(0);
+            topLayout->setContentsMargins(0, 0, 0, 0);
             topLayout->setSpacing(0);
             topLayout->addWidget(haplotypeView);
 
@@ -96,7 +96,7 @@ void QtSLiMHaplotypeManager::CreateHaplotypePlot(QtSLiMWindow *controller)
             {
                 buttonLayout = new QHBoxLayout;
 
-                buttonLayout->setMargin(5);
+                buttonLayout->setContentsMargins(5, 5, 5, 5);
                 buttonLayout->setSpacing(5);
                 topLayout->addLayout(buttonLayout);
 

diff --git a/QtSLiM/QtSLiMWindow.cpp b/QtSLiM/QtSLiMWindow.cpp
@@ -613,15 +613,15 @@ void QtSLiMWindow::initializeUI(void)
 
     // fix the layout of the window
     ui->scriptHeaderLayout->setSpacing(4);
-    ui->scriptHeaderLayout->setMargin(0);
+    ui->scriptHeaderLayout->setContentsMargins(0, 0, 0, 0);
     ui->scriptHeaderLabel->setContentsMargins(8, 0, 15, 0);
 
     ui->outputHeaderLayout->setSpacing(4);
-    ui->outputHeaderLayout->setMargin(0);
+    ui->outputHeaderLayout->setContentsMargins(0, 0, 0, 0);
     ui->outputHeaderLabel->setContentsMargins(8, 0, 15, 0);
 
     ui->playControlsLayout->setSpacing(8);
-    ui->playControlsLayout->setMargin(0);
+    ui->playControlsLayout->setContentsMargins(0, 0, 0, 0);
 
     // substitute a custom layout subclass for playControlsLayout to lay out the profile button specially
     {
@@ -647,7 +647,7 @@ void QtSLiMWindow::initializeUI(void)
 
             // Transfer properties of the old layout
             newPlayControlsLayout->setSpacing(ui->playControlsLayout->spacing());
-            newPlayControlsLayout->setMargin(ui->playControlsLayout->margin());
+            newPlayControlsLayout->setContentsMargins(ui->playControlsLayout->contentsMargins());
 
             // Get rid of the old layout
             ui->topRightLayout->removeItem(ui->playControlsLayout);
@@ -6020,7 +6020,7 @@ QWidget *QtSLiMWindow::imageWindowWithPath(const QString &path)
     QVBoxLayout *topLayout = new QVBoxLayout;
 
     image_window->setLayout(topLayout);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     topLayout->setSpacing(0);
     topLayout->addWidget(imageView);
 
@@ -6119,7 +6119,7 @@ QWidget *QtSLiMWindow::graphWindowWithView(QtSLiMGraphView *graphView, double wi
     QVBoxLayout *topLayout = new QVBoxLayout;
 
     graph_window->setLayout(topLayout);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     topLayout->setSpacing(0);
     topLayout->addWidget(graphView);
 
@@ -6129,7 +6129,7 @@ QWidget *QtSLiMWindow::graphWindowWithView(QtSLiMGraphView *graphView, double wi
     {
         buttonLayout = new QHBoxLayout;
 
-        buttonLayout->setMargin(5);
+        buttonLayout->setContentsMargins(5, 5, 5, 5);
         buttonLayout->setSpacing(5);
         topLayout->addLayout(buttonLayout);