From e42ff6399e806ef04cb9149217de5da706201439 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 14 Mar 2018 12:44:38 +0100 Subject: [PATCH] Fix build with namespaced Qt Change-Id: If5675920a5e4020a8a21e103eed6613475f709b5 Reviewed-by: Joerg Bornemann --- src/plugins/coreplugin/dialogs/filepropertiesdialog.h | 2 ++ src/plugins/serialterminal/serialterminalsettings.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.h b/src/plugins/coreplugin/dialogs/filepropertiesdialog.h index 3459b61e433..906e26aa237 100644 --- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.h +++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.h @@ -30,9 +30,11 @@ #include #include +QT_BEGIN_NAMESPACE namespace Ui { class FilePropertiesDialog; } +QT_END_NAMESPACE class FilePropertiesDialog : public QDialog { diff --git a/src/plugins/serialterminal/serialterminalsettings.h b/src/plugins/serialterminal/serialterminalsettings.h index 250eec48b71..06a9cb0cec7 100644 --- a/src/plugins/serialterminal/serialterminalsettings.h +++ b/src/plugins/serialterminal/serialterminalsettings.h @@ -31,7 +31,9 @@ #include #include +QT_BEGIN_NAMESPACE class QSettings; +QT_END_NAMESPACE namespace SerialTerminal { namespace Internal {