From 05ba81b9c3e413c2ddb03923cf3f8333feaa77b5 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 6 Jul 2010 14:36:02 +0200 Subject: [PATCH] qmldesigner: compile fix for linux, compile fix for namespaced Qt --- .../components/propertyeditor/contextpanetextwidget.h | 2 ++ .../qmldesigner/components/propertyeditor/contextpanewidget.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h b/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h index d0227f12458..c0678983eed 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h @@ -4,9 +4,11 @@ #include #include +QT_BEGIN_NAMESPACE namespace Ui { class ContextPaneTextWidget; } +QT_END_NAMESPACE namespace QmlJS { class PropertyReader; diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp index 38ef4a4caa6..1228f1f0601 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include