mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-06 22:58:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmake-gui-completion' into release-3.19

Browse Source 
854f5ea1cb cmake-gui: Restore completion during path editing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5619
This commit is contained in:
Brad King
2020-12-16 11:17:01 +00:00
committed by Kitware Robot
parent 7932e0a46e 854f5ea1cb
commit cd107321f7
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/QtDialog/QCMakeWidgets.cxx
View File

@@ -1,12 +1,17 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
// FIXME: Port to QFileSystemModel from the deprecated QDirModel.
// Be sure completion works when incrementally editing existing paths.
#define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION_CHECK(5, 14, 0)
#include "QCMakeWidgets.h"
#include <utility>
#include <QDirModel>
#include <QFileDialog>
#include <QFileInfo>
#include <QFileSystemModel>
#include <QResizeEvent>
#include <QToolButton>
@@ -88,20 +93,20 @@ void QCMakePathEditor::chooseFile()
}
}
// use same QFileSystemModel for all completers
static QFileSystemModel* fileDirModel()
// use same QDirModel for all completers
static QDirModel* fileDirModel()
{
static QFileSystemModel* m = nullptr;
static QDirModel* m = nullptr;
if (!m) {
m = new QFileSystemModel();
m = new QDirModel();
}
return m;
}
static QFileSystemModel* pathDirModel()
static QDirModel* pathDirModel()
{
static QFileSystemModel* m = nullptr;
static QDirModel* m = nullptr;
if (!m) {
m = new QFileSystemModel();
m = new QDirModel();
m->setFilter(QDir::AllDirs | QDir::Drives | QDir::NoDotAndDotDot);
}
return m;
@@ -110,7 +115,7 @@ static QFileSystemModel* pathDirModel()
QCMakeFileCompleter::QCMakeFileCompleter(QObject* o, bool dirs)
: QCompleter(o)
{
QFileSystemModel* m = dirs ? pathDirModel() : fileDirModel();
QDirModel* m = dirs ? pathDirModel() : fileDirModel();
this->setModel(m);
}