From e3fa65f6f3312d995aded99fa0b22323ddb8fd01 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 2 Oct 2013 15:01:49 +0200 Subject: [PATCH] CppEditor: Fix build with namespaced Qt. Change-Id: Id5a2dce79b27c8c4599d7cdc0935064f5db44f13 Reviewed-by: Christian Kandeler --- src/plugins/cppeditor/cpppreprocessoradditionwidget.h | 5 +---- src/plugins/cppeditor/cpppreprocessoradditionwidget.ui | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/cppeditor/cpppreprocessoradditionwidget.h b/src/plugins/cppeditor/cpppreprocessoradditionwidget.h index c9289b0e21c..d69a3d9de30 100644 --- a/src/plugins/cppeditor/cpppreprocessoradditionwidget.h +++ b/src/plugins/cppeditor/cpppreprocessoradditionwidget.h @@ -37,12 +37,9 @@ #include #include -namespace Ui { -class CppPreProcessorAdditionWidget; -} - namespace CppEditor { namespace Internal { +namespace Ui { class CppPreProcessorAdditionWidget; } class PreProcessorAdditionWidget : public QWidget { diff --git a/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui b/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui index c009a50646a..101ba17d3fe 100644 --- a/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui +++ b/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui @@ -1,7 +1,7 @@ - CppPreProcessorAdditionWidget - + CppEditor::Internal::CppPreProcessorAdditionWidget + 0