Commit 06da3b7f authored by hjk's avatar hjk

Designer: Remove support to build with Qt 4

Change-Id: Ie265065f65cdfe0d5a2cc0cbc11362743dcbdaa7
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent f6fea87a
......@@ -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 \
......
......@@ -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)
......
......@@ -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
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment