diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2011-11-16 13:09:03 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2011-11-16 13:15:04 +0100 |
| commit | b41237f01ef626381d8519f0703e54a4551f6c36 (patch) | |
| tree | 408c4c6432b99f8d1f90590aab3c569b436107b4 /src | |
| parent | bb48e072bed838d2c0ec15f8dccdae06a6930695 (diff) | |
| download | qt-creator-b41237f01ef626381d8519f0703e54a4551f6c36.tar.gz | |
Don't use MDeclarativeCache::qDeclarativeView()
Commit d687d11240877f848f3d1c28e2ec70ed4ff555f4 unfortunately caused
two severe regressions for MeeGo:
QTCREATORBUG-6473: The application creates two QDeclarativeViews
QTCREATORBUG-6490: QDView functions inaccessible. Existing apps broken
This commit removes most of d687d11240877f848f3d1c28e2ec70ed4ff555f4
just leaving the boosted QApplication. Now, QmlApplicationViewer *is*
again the QDeclarativeView.
Change-Id: I219540353ff4dd1061221d6cbe69ce9a58500e91
Task-Id: QTCREATORBUG-6473
Task-Id: QTCREATORBUG-6490
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index a2cf2171fc..c9453a9073 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -466,7 +466,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const } } -const int QtQuickApp::StubVersion = 18; +const int QtQuickApp::StubVersion = 19; } // namespace Internal } // namespace Qt4ProjectManager |