feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Designer: Remove compatibility code for Qt < 5.0

Browse Source 
Change-Id: I3ebe69b2c56635d1978da994fc772536a2839304
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-08-20 16:09:26 +02:00
committed by Eike Ziller
parent 48157ccb53
commit 208865dd0a
13 changed files with 12 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/designer/qtcreatorintegration.cpp
View File

@@ -77,24 +77,14 @@ static QString msgClassNotFound(const QString &uiClassName, const QList<Document
}
QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent) :
#if QT_VERSION >= 0x050000
QDesignerIntegration(core, parent),
#else
qdesigner_internal::QDesignerIntegration(core, parent),
#endif
m_few(parent)
{
#if QT_VERSION >= 0x050000
setResourceFileWatcherBehaviour(ReloadResourceFileSilently);
Feature f = features();
f |= SlotNavigationFeature;
f &= ~ResourceEditorFeature;
setFeatures(f);
#else
setResourceFileWatcherBehaviour(QDesignerIntegration::ReloadSilently);
setResourceEditingEnabled(false);
setSlotNavigationEnabled(true);
#endif
connect(this, SIGNAL(navigateToSlot(QString,QString,QStringList)),
this, SLOT(slotNavigateToSlot(QString,QString,QStringList)));
connect(this, SIGNAL(helpRequested(QString,QString)),
@@ -115,11 +105,7 @@ void QtCreatorIntegration::updateSelection()
{
if (const EditorData ed = m_few->activeEditor())
ed.widgetHost->updateFormWindowSelectionHandles(true);
#if QT_VERSION >= 0x050000
QDesignerIntegration::updateSelection();
#else
qdesigner_internal::QDesignerIntegration::updateSelection();
#endif
}
QWidget *QtCreatorIntegration::containerWindow(QWidget * /*widget*/) const