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

Designer: Compilation with Qt 5.

Browse Source 
Test the new Qt Designer integration interfaces.

Change-Id: I8364167d5be3e7c361b192318b0bba7fb70d0f2f
Reviewed-on: http://codereview.qt.nokia.com/9
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-05-19 11:30:38 +02:00
committed by Kai Koehne
parent 0d3d38ecc1
commit b0d093b0d7
13 changed files with 203 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/designer/resourcehandler.h
View File

@@ -37,9 +37,13 @@
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
#if QT_VERSION >= 0x050000
class QDesignerFormWindowInterface;
#else
namespace qdesigner_internal {
class FormWindowBase;
}
#endif
QT_END_NAMESPACE
namespace ProjectExplorer {
@@ -64,7 +68,11 @@ class ResourceHandler : public QObject
{
Q_OBJECT
public:
explicit ResourceHandler(qdesigner_internal::FormWindowBase *fw);
#if QT_VERSION >= 0x050000
explicit ResourceHandler(QDesignerFormWindowInterface *fw);
#else
explicit ResourceHandler(qdesigner_internal::FormWindowBase *fw);
#endif
virtual ~ResourceHandler();
public slots:
@@ -72,9 +80,11 @@ 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;