diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-30 15:59:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-30 15:59:07 +0200 |
| commit | 57ae91c5efd856832ffb913af3aa4ba28ae1d787 (patch) | |
| tree | 081f38620739883901125a89182715356abbbf84 /share/qtcreator/templates | |
| parent | 90a7786ddedc1c417895cc1a9b7c866afd59730b (diff) | |
| parent | bc7abeb6021c1705fbd94ea5362f16a1c3325835 (diff) | |
| download | qt-creator-57ae91c5efd856832ffb913af3aa4ba28ae1d787.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
doc/qtcreator.qdoc
qtcreator.pri
Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
Diffstat (limited to 'share/qtcreator/templates')
3 files changed, 4 insertions, 2 deletions
diff --git a/share/qtcreator/templates/qtquickapp/qml/app/meego10/MainPage.qml b/share/qtcreator/templates/qtquickapp/qml/app/meego10/MainPage.qml index b02ef34642..9de64968f4 100644 --- a/share/qtcreator/templates/qtquickapp/qml/app/meego10/MainPage.qml +++ b/share/qtcreator/templates/qtquickapp/qml/app/meego10/MainPage.qml @@ -1,5 +1,5 @@ import QtQuick 1.1 -import com.meego 1.0 +import com.nokia.meego 1.0 Page { tools: commonTools diff --git a/share/qtcreator/templates/qtquickapp/qml/app/meego10/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/meego10/main.qml index cb3a632b29..90b8797946 100644 --- a/share/qtcreator/templates/qtquickapp/qml/app/meego10/main.qml +++ b/share/qtcreator/templates/qtquickapp/qml/app/meego10/main.qml @@ -1,5 +1,5 @@ import QtQuick 1.1 -import com.meego 1.0 +import com.nokia.meego 1.0 PageStackWindow { id: appWindow diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp index e589d09efa..0f7a2bd874 100644 --- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -16,6 +16,8 @@ #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeContext> +#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN + #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800 #include <qt_private/qdeclarativedebughelper_p.h> |