From b56b597cbf9ebfb81559848cef919e5c057e8fed Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 10 Jul 2019 17:39:03 +0100
Subject: [PATCH] Remove use of more deprecated Qt functions, disable
 deprecation warnings

* Unfortunately at least one deprecated function
  QDesktopWidget::screenGeometry(const QPoint &p) has no easy alternative that
  works on 5.9 which is the version we have available by default on windows.
---
 qrenderdoc/Windows/Dialogs/SettingsDialog.cpp    | 4 ++--
 qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp | 2 +-
 qrenderdoc/qrenderdoc.pro                        | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
index d5764a95b..8b98176d7 100644
--- a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
@@ -64,7 +64,7 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
   }
 
   ui->pages->clearSelection();
-  ui->pages->setItemSelected(ui->pages->item(0), true);
+  ui->pages->item(0)->setSelected(true);
   ui->tabWidget->setCurrentIndex(0);
 
   ui->pages->setMinimumWidth(ui->pages->sizeHintForColumn(0));
@@ -218,7 +218,7 @@ void SettingsDialog::on_pages_itemSelectionChanged()
 
   if(sel.empty())
   {
-    ui->pages->setItemSelected(ui->pages->item(ui->tabWidget->currentIndex()), true);
+    ui->pages->item(ui->tabWidget->currentIndex())->setSelected(true);
   }
   else
   {
diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
index 429ff2b5c..57fe5ae70 100644
--- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
@@ -496,7 +496,7 @@ public:
     return qMin(maxColCount, sourceModel()->columnCount(parent));
   }
 
-  void refresh() { QSortFilterProxyModel::filterChanged(); }
+  void refresh() { QSortFilterProxyModel::invalidateFilter(); }
   int maxColCount = INT_MAX;
   bool showFiles = true;
   bool showDirs = true;
diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
index 6a337f96b..c151d3cce 100644
--- a/qrenderdoc/qrenderdoc.pro
+++ b/qrenderdoc/qrenderdoc.pro
@@ -32,6 +32,9 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/scintilla/include
 # Disable conversions to/from const char * in QString
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 
+# Disable deprecation warnings that are default on in 5.13 and up
+DEFINES += QT_NO_DEPRECATED_WARNINGS
+
 # Different output folders per platform
 win32 {