Commit d687d11240 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 d687d11240
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>
There is no good reason to break the Qt coding style, here. The
strings "%1/../Resources/%2" and "%1/../%2" are Latin1 aswell
as Ascii.
Change-Id: Idbf3b7650fd650f93293496839fec4d21626cd0b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Add support for the meego booster. This requires
- Telling qmake to link to right libraries
- Exporting main method
- using QApplication, QDeclarativeView objects from cache
- avoiding QCoreApplication::applicationDirPath()
To keep compatibility, QmlApplicationViewer is still derived from QDeclarativeView.
However, if the app booster is used it merely acts as a proxy to the view from the
cache.
Change-Id: I83e285d9ca3c2cfd86d1711e1fb93c72589ba14d
Reviewed-on: http://codereview.qt.nokia.com/3730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Use QString().arg() instead of + , which might be undefined if the
user adds QT_USE_FAST_CONCATENATION to the .pro file.
Task-number: QTCREATORBUG-5796
Change-Id: Ic842cae650c8fa898d72065f3a1c672f5eb893d4
Reviewed-on: http://codereview.qt.nokia.com/2939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
As of Qt 4.8 the observer and jsdebugger services are part of Qt. This
means the following changes are necessary in Qt Creator:
* Do not link to the QmlJSDebugger library.
* Do not create JSDebuggerAgent and QDeclarativeViewObserver instances
in the QmlApplicationViewer and use the new declarative_debug CONFIG
option to enable those services in Qt. This is done automatically
for debug builds.
* Point out the QML Debugging Library and the QML Observer are "Not
needed" in the Qt options page.
* Change the label in qmake options from "Link QML debugging library" to
"Enable QML debugging". It still remains as a way to enable this
functionality in release builds or for QtQuick applications not based
on Qt Creator's template.
* Rely on qmlviewer for debugging QML UI projects rather than the
observer, which is no longer necessary.
Reviewed-by: Kai Koehne
This makes sure it gets deleted together with the QmlApplicationViewer,
rather than probably not at all when no parent is specified for the
viewer (which is the default).
Reviewed-by: Alessandro Portale
Reviewed-by: Christiaan Janssen
