diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-19 11:30:38 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-05-19 11:48:55 +0200 |
| commit | b0d093b0d7095d4b4d2de38dc965690c7b540d37 (patch) | |
| tree | a1cd9a6c5c51409115e580e7d8b690738eea0e47 /src/plugins/designer/qtcreatorintegration.h | |
| parent | 0d3d38ecc1fe0a0fc9eeb67d83d2aa73522021f8 (diff) | |
| download | qt-creator-b0d093b0d7095d4b4d2de38dc965690c7b540d37.tar.gz | |
Designer: Compilation with Qt 5.
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>
Diffstat (limited to 'src/plugins/designer/qtcreatorintegration.h')
| -rw-r--r-- | src/plugins/designer/qtcreatorintegration.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h index 1b4d714ceb..402056216f 100644 --- a/src/plugins/designer/qtcreatorintegration.h +++ b/src/plugins/designer/qtcreatorintegration.h @@ -35,7 +35,11 @@ #include <cplusplus/ModelManagerInterface.h> -#include "qt_private/qdesigner_integration_p.h" +#if QT_VERSION >= 0x050000 +# include <QtDesigner/QDesignerIntegration> +#else +# include "qt_private/qdesigner_integration_p.h" +#endif QT_FORWARD_DECLARE_CLASS(QUrl) @@ -44,7 +48,12 @@ namespace Internal { class FormEditorW; -class QtCreatorIntegration : public qdesigner_internal::QDesignerIntegration { +class QtCreatorIntegration : +#if QT_VERSION >= 0x050000 + public QDesignerIntegration { +#else + public qdesigner_internal::QDesignerIntegration { +#endif Q_OBJECT public: explicit QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent = 0); |