diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 11:22:08 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2012-01-31 06:33:34 +0100 |
| commit | dbf35e498db723ae9850686e462ec4f45bc7b67c (patch) | |
| tree | cf1f98717e131f26e5a6d63f6693935b2fbdb76f /tools | |
| parent | 12a5ddf456ba8549645a8cb28a8b4ed6197a14da (diff) | |
Modify QtQuick1 to build in Qt5
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/plugins/plugins.pro | 5 | ||||
| -rw-r--r-- | tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro | 2 | ||||
| -rw-r--r-- | tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/qml/qml.pri | 2 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 1 | ||||
| -rw-r--r-- | tools/tools.pro | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro index bcebb82e..b9a497cf 100644 --- a/tools/designer/src/plugins/plugins.pro +++ b/tools/designer/src/plugins/plugins.pro @@ -2,9 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered REQUIRES = !CONFIG(static,shared|static) -contains(QT_CONFIG, qt3support): SUBDIRS += widgets -win32: SUBDIRS += activeqt -# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d -contains(QT_CONFIG, webkit): SUBDIRS += qwebview -contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index b8abe874..cbe3ebe2 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qdeclarativeview CONFIG += qt warn_on plugin designer -QT += declarative +QT += quick1 include(../plugins.pri) build_all:!build_pass { diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp index d35df04f..f6c4fd69 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp @@ -45,7 +45,7 @@ #include <QtDesigner/QExtensionManager> #include <QtCore/qplugin.h> -#include <QtDeclarative/QDeclarativeView> +#include <QtQuick1/QDeclarativeView> static const char toolTipC[] = "QtDeclarative view widget"; diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index cfc74af8..f118bb25 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -1,4 +1,4 @@ -QT += declarative script network sql +QT += quick1 quick1-private script network sql core-private gui-private widgets-private contains(QT_CONFIG, opengl) { QT += opengl DEFINES += GL_SUPPORTED diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 3d1b84bb..05b94363 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qt uic declarative_debug +CONFIG += qt uic quick1_debug DESTDIR = ../../bin include(qml.pri) diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 9f79f3b7..a5fe8608 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -92,6 +92,7 @@ #include <QKeyEvent> #include <QMutex> #include <QMutexLocker> +#include <QMimeData> #include "proxysettings.h" #include "deviceorientation.h" diff --git a/tools/tools.pro b/tools/tools.pro new file mode 100644 index 00000000..f17f4cb5 --- /dev/null +++ b/tools/tools.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += qml |