feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangdfollowsymbol.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I45b7fee1a1d784c44f2139fb1ede69190d23d6fd
This commit is contained in:
Eike Ziller
2023-12-06 16:50:15 +01:00
parent 6a97b66592 d1ac2fe45a
commit 2e280e1c50
31 changed files with 330 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/icore.cpp
View File

@@ -52,6 +52,7 @@
#include <utils/algorithm.h>
#include <utils/appinfo.h>
#include <utils/checkablemessagebox.h>
#include <utils/dropsupport.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/fsengine/fileiconprovider.h>
@@ -1318,12 +1319,11 @@ void ICorePrivate::init()
m_modeStack->statusBar()->setProperty("p_styled", true);
/*auto dropSupport = new DropSupport(this, [](QDropEvent *event, DropSupport *) {
auto dropSupport = new DropSupport(m_mainwindow, [](QDropEvent *event, DropSupport *) {
return event->source() == nullptr; // only accept drops from the "outside" (e.g. file manager)
});
connect(dropSupport, &DropSupport::filesDropped,
this, &MainWindow::openDroppedFiles);
*/
connect(dropSupport, &DropSupport::filesDropped, this, &ICorePrivate::openDroppedFiles);
if (HostOsInfo::isLinuxHost()) {
m_trimTimer.setSingleShot(true);
m_trimTimer.setInterval(60000);