diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-24 14:09:13 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-30 08:53:32 +0100 |
| commit | 56712a395be47e338ed536d32792e4734eb3296f (patch) | |
| tree | 943ffe266ff42fbc74b132c347000b4109745cc5 /src/designer/src/designer/qdesigner_actions.cpp | |
| parent | ea93dfc7c3626c503546c33c3e81e5beaea01771 (diff) | |
Qt Designer: Remove "using namespace qdesigner_internal" from sources
It causes clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I86e44bc5f0d9509ebf903fbb67166e4ce7bb6f35
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/designer/qdesigner_actions.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index caa0dad78..9a8b7f91c 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -80,7 +80,6 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; using namespace Qt::StringLiterals; const char *QDesignerActions::defaultToolbarPropertyName = "__qt_defaultToolBarAction"; @@ -311,7 +310,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench) m_editWidgetsAction->setProperty(QDesignerActions::defaultToolbarPropertyName, true); m_toolActions->addAction(m_editWidgetsAction); - connect(formWindowManager, &QDesignerFormWindowManager::activeFormWindowChanged, + connect(formWindowManager, &qdesigner_internal::QDesignerFormWindowManager::activeFormWindowChanged, this, &QDesignerActions::activeFormWindowChanged); const QObjectList builtinPlugins = QPluginLoader::staticInstances() @@ -1160,7 +1159,7 @@ bool QDesignerActions::ensureBackupDirectories() { if (m_backupPath.isEmpty()) { // create names - m_backupPath = dataDirectory() + u"/backup"_s; + m_backupPath = qdesigner_internal::dataDirectory() + u"/backup"_s; m_backupTmpPath = m_backupPath + u"/tmp"_s; } @@ -1219,7 +1218,7 @@ QPixmap QDesignerActions::createPreviewPixmap(QDesignerFormWindowInterface *fw) qdesigner_internal::PreviewConfiguration QDesignerActions::previewConfiguration() { qdesigner_internal::PreviewConfiguration pc; - QDesignerSharedSettings settings(core()); + qdesigner_internal::QDesignerSharedSettings settings(core()); if (settings.isCustomPreviewConfigurationEnabled()) pc = settings.customPreviewConfiguration(); return pc; |