diff options
| author | Tim Jenssen <[email protected]> | 2023-11-01 16:17:04 +0100 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2023-11-01 16:40:26 +0100 |
| commit | b5c60597dc7c0ce6a0e76f30103d5cb1842ae97f (patch) | |
| tree | ea9c06c73616855395a0d9b8a02bb5251a3a4f4a /src/libs/advanceddockingsystem/dockmanager.h | |
| parent | 4f2a06297752398b2a0eac498e28da16d2f0b0ea (diff) | |
| parent | 9893768461cde6a8df732bf1f0e001bd052390bb (diff) | |
Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: Iefea658312bba6675eadce23fb8dc92f9207ea0e
Diffstat (limited to 'src/libs/advanceddockingsystem/dockmanager.h')
| -rw-r--r-- | src/libs/advanceddockingsystem/dockmanager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h index 31621449d58..c11bd6ebb16 100644 --- a/src/libs/advanceddockingsystem/dockmanager.h +++ b/src/libs/advanceddockingsystem/dockmanager.h @@ -23,9 +23,10 @@ QT_BEGIN_NAMESPACE class QMenu; -class QSettings; QT_END_NAMESPACE +namespace Utils { class QtcSettings; } + namespace ADS { namespace Constants { @@ -277,7 +278,7 @@ public: /** * Set the QtCreator settings. */ - void setSettings(QSettings *settings); + void setSettings(Utils::QtcSettings *settings); /** * Set the path to the workspace presets folder. |