From ebf7c687051993876831b830c107fb62fe8e84cc Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Mon, 29 Aug 2011 16:42:34 +0200
Subject: [PATCH] QmlDesigner.NodeInstances: Remove Qt5 guards

Change-Id: Ia740b2818dcc287ff82991ae317bcf644c4c0c2a
Reviewed-on: http://codereview.qt.nokia.com/3968
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
 .../qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp  | 3 ---
 .../qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h    | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index 3614e533a96..8694223538c 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -32,7 +32,6 @@
 
 #include "qt5nodeinstanceserver.h"
 
-#if QT_VERSION >= 0x050000
 
 #include <QSGItem>
 #include <QSGView>
@@ -162,5 +161,3 @@ void Qt5NodeInstanceServer::clearScene(const ClearSceneCommand &command)
 }
 
 } // QmlDesigner
-
-#endif // QT_VERSION
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
index 58f0342ba9b..c425c44e160 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
@@ -37,8 +37,6 @@
 
 #include "nodeinstanceserver.h"
 
-#if QT_VERSION >= 0x050000
-
 QT_BEGIN_NAMESPACE
 class QSGItem;
 class DesignerSupport;
@@ -77,6 +75,4 @@ private:
 
 } // QmlDesigner
 
-#endif // QT_VERSION
-
 #endif // QT5NODEINSTANCESERVER_H
-- 
GitLab