diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-18 15:47:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 15:47:17 +0200 |
| commit | b883ce5c517e0d22d994ec894aa868d7e2392b06 (patch) | |
| tree | 2408832b17b4b7e081017cfd585eeb5783b98081 /launcher/ui | |
| parent | cc13310083fe8d0c3bb423fa3e31db7b1f7b25e1 (diff) | |
| parent | a21bd41580ba8ba4c0052efa8196d617e7211335 (diff) | |
| download | PrismLauncher-b883ce5c517e0d22d994ec894aa868d7e2392b06.tar.gz PrismLauncher-b883ce5c517e0d22d994ec894aa868d7e2392b06.tar.bz2 PrismLauncher-b883ce5c517e0d22d994ec894aa868d7e2392b06.zip | |
Merge pull request #127 from Scrumplex/refactor-bump-qt5.12
Diffstat (limited to 'launcher/ui')
| -rw-r--r-- | launcher/ui/dialogs/ExportInstanceDialog.cpp | 8 | ||||
| -rw-r--r-- | launcher/ui/pages/global/ExternalToolsPage.cpp | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp index 5fac1015..8631edf6 100644 --- a/launcher/ui/dialogs/ExportInstanceDialog.cpp +++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp @@ -117,7 +117,7 @@ public: flags |= Qt::ItemIsUserCheckable; if (sourceIndex.model()->hasChildren(sourceIndex)) { - flags |= Qt::ItemIsTristate; + flags |= Qt::ItemIsAutoTristate; } } @@ -210,7 +210,7 @@ public: QStack<QModelIndex> todo; while (1) { - auto node = doing.child(row, 0); + auto node = fsm->index(row, 0, doing); if (!node.isValid()) { if (!todo.size()) @@ -259,7 +259,7 @@ public: QStack<QModelIndex> todo; while (1) { - auto node = doing.child(row, 0); + auto node = this->index(row, 0, doing); if (!node.isValid()) { if (!todo.size()) @@ -460,7 +460,7 @@ void ExportInstanceDialog::rowsInserted(QModelIndex parent, int top, int bottom) //WARNING: possible off-by-one? for(int i = top; i < bottom; i++) { - auto node = parent.child(i, 0); + auto node = proxyModel->index(i, 0, parent); if(proxyModel->shouldExpand(node)) { auto expNode = node.parent(); diff --git a/launcher/ui/pages/global/ExternalToolsPage.cpp b/launcher/ui/pages/global/ExternalToolsPage.cpp index 693ca5c1..5ba0ebc2 100644 --- a/launcher/ui/pages/global/ExternalToolsPage.cpp +++ b/launcher/ui/pages/global/ExternalToolsPage.cpp @@ -54,9 +54,7 @@ ExternalToolsPage::ExternalToolsPage(QWidget *parent) : ui->setupUi(this); ui->tabWidget->tabBar()->hide(); - #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) ui->jsonEditorTextBox->setClearButtonEnabled(true); - #endif ui->mceditLink->setOpenExternalLinks(true); ui->jvisualvmLink->setOpenExternalLinks(true); |