From 06da3b7f18b0fbd489ffba142d50b6a8c3826e38 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 26 Aug 2014 13:50:59 +0200
Subject: [PATCH] Designer: Remove support to build with Qt 4

Change-Id: Ie265065f65cdfe0d5a2cc0cbc11362743dcbdaa7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/designer/designer.pro             | 15 +--------------
 src/plugins/designer/formwindowfile.cpp       |  9 +--------
 src/plugins/designer/qtcreatorintegration.cpp |  2 --
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index c0915e57fcc..d677181d1dd 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -4,20 +4,7 @@ include(../../qtcreatorplugin.pri)
 include(../../shared/designerintegrationv2/designerintegration.pri)
 include(cpp/cpp.pri)
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += printsupport designer designercomponents-private
-} else {
-    # -- figure out shared dir location
-    !exists($$[QT_INSTALL_HEADERS]/QtDesigner/private/qdesigner_integration_p.h) {
-        QT_SOURCE_TREE=$$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE)
-        INCLUDEPATH += $$QT_SOURCE_TREE/include
-    }
-    INCLUDEPATH += $$QMAKE_INCDIR_QT/QtDesigner
-    qtAddLibrary(QtDesigner)
-    qtAddLibrary(QtDesignerComponents)
-}
-
-QT += xml
+QT += printsupport designer designercomponents-private xml
 
 HEADERS += formeditorplugin.h \
         formeditorfactory.h \
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index f6208a83467..26fe21d5891 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -212,16 +212,9 @@ void FormWindowFile::syncXmlFromFormWindow()
 
 QString FormWindowFile::formWindowContents() const
 {
-#if QT_VERSION >= 0x050000    // TODO: No warnings about spacers here
+    // TODO: No warnings about spacers here
     QTC_ASSERT(m_formWindow, return QString());
     return m_formWindow->contents();
-#else
-    // No warnings about spacers here
-    const qdesigner_internal::FormWindowBase *fw =
-            qobject_cast<const qdesigner_internal::FormWindowBase *>(m_formWindow);
-    QTC_ASSERT(fw, return QString());
-    return fw->fileContents();
-#endif
 }
 
 void FormWindowFile::slotFormWindowRemoved(QDesignerFormWindowInterface *w)
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 89ade1f8587..c0fc2b83487 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -641,9 +641,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
 
 void QtCreatorIntegration::slotSyncSettingsToDesigner()
 {
-#if QT_VERSION > 0x040800
     // Set promotion-relevant parameters on integration.
     setHeaderSuffix(Core::MimeDatabase::preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)));
     setHeaderLowercase(FormClassWizardPage::lowercaseHeaderFiles());
-#endif
 }