diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index c0915e57fcc9385e85712348f8a5498e748835ce..d677181d1dd8b209214df9ae6f8a070933e48107 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 f6208a834672b7236717691c25e43aab07bb26c6..26fe21d5891f55803c6c0d8ed2ee6acebd7858d0 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 89ade1f8587596ed1d0a8908c8524ae3925ced66..c0fc2b834874c4526662c751f8baf35d78b6873c 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 }