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/resourcehandler.h
View File

@@ -34,11 +34,7 @@
#include <QStringList>
QT_BEGIN_NAMESPACE
#if QT_VERSION >= 0x050000
class QDesignerFormWindowInterface;
#else
namespace qdesigner_internal { class FormWindowBase; }
#endif
QT_END_NAMESPACE
namespace ProjectExplorer {
@@ -63,11 +59,7 @@ class ResourceHandler : public QObject
{
Q_OBJECT
public:
#if QT_VERSION >= 0x050000
explicit ResourceHandler(QDesignerFormWindowInterface *fw);
#else
explicit ResourceHandler(qdesigner_internal::FormWindowBase *fw);
#endif
explicit ResourceHandler(QDesignerFormWindowInterface *fw);
virtual ~ResourceHandler();
public slots:
@@ -75,11 +67,7 @@ public slots:
private:
void ensureInitialized();
#if QT_VERSION >= 0x050000
QDesignerFormWindowInterface * const m_form;
#else
qdesigner_internal::FormWindowBase * const m_form;
#endif
QStringList m_originalUiQrcPaths;
ProjectExplorer::SessionNode *m_sessionNode;
ProjectExplorer::NodesWatcher *m_sessionWatcher;