diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-09-20 09:47:45 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-09-20 13:43:20 +0200 |
| commit | 6a99368979419c2d937e962b7c01729665f617f5 (patch) | |
| tree | 5dc5c4480eccc2339394a53268812b93335ecc41 /src/libs | |
| parent | cb5eaf4a631f402204e0f05a0891e809183656a9 (diff) | |
| parent | 24e3cb3ab959240daee275e7f704e9098b8c495d (diff) | |
| download | qt-creator-6a99368979419c2d937e962b7c01729665f617f5.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/libs/utils/processreaper.cpp
src/plugins/android/androidbuildapkstep.cpp
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
Change-Id: I353a445b5862f63362ea954749b5565360951283
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/advanceddockingsystem/floatingdockcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/libs/utils/processreaper.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/advanceddockingsystem/floatingdockcontainer.cpp b/src/libs/advanceddockingsystem/floatingdockcontainer.cpp index 59575ab20a..3865f287da 100644 --- a/src/libs/advanceddockingsystem/floatingdockcontainer.cpp +++ b/src/libs/advanceddockingsystem/floatingdockcontainer.cpp @@ -562,7 +562,7 @@ static const char* windowsMessageString(int messageId) this, &FloatingDockContainer::close); #else - setWindowFlags(Qt::Window | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint); + setWindowFlags(Qt::Window | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::Tool); QBoxLayout *boxLayout = new QBoxLayout(QBoxLayout::TopToBottom); boxLayout->setContentsMargins(0, 0, 0, 0); boxLayout->setSpacing(0); diff --git a/src/libs/utils/processreaper.cpp b/src/libs/utils/processreaper.cpp index daaab5dee6..b3679c7d95 100644 --- a/src/libs/utils/processreaper.cpp +++ b/src/libs/utils/processreaper.cpp @@ -154,7 +154,7 @@ void ProcessReaper::reap(QProcess *process, int timeoutMs) if (!process) return; - QTC_ASSERT(QThread::currentThread() == process->thread(), return); + QTC_ASSERT(QThread::currentThread() == process->thread(), return ); process->disconnect(); if (process->state() == QProcess::NotRunning) { |