Commit Graph

21 Commits

Author SHA1 Message Date
con
b69ab309cd Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/debugger/debuggeractions.cpp
2011-02-04 11:46:30 +01:00
Alessandro Portale
d4e5890286 Removing the usage of Avkon to lock the screen orientation
Locking the screen orientation was not a Qt feature of the Symbian
port till Qt 4.7.2. Therefore, client applications had to do the
locking themselves. That locking is right now only achievable by
using Avkon Api. The template code of the Qt Quick App wizard did
exactly that.
Now, Qt 4.7.2 has the screen orientation lock built in. That
implementation was done for QTBUG-11785. No need to do that in the
application code, anymore.

This patch removes Avkon usage from the templates, using new enum keys
and setting QWidget flags, just like Maemo5 does.

Two Qt version checks/fixes:
1) If the application tries to lock the orientation on Qt < 4.7.2,
   a warning is given that this won't work
2) If Qt < 4.7.2 is used to build the application, the enum keys are
   not used directly but casted from constants

Task-Number: QTCREATORBUG-3598
Reviewed-by: ck
2011-02-03 12:50:01 +01:00
Christian Kandeler
30b036502b Maemo: Don't use Q_WS_MAEMO_6.
This symbol does not exist.

Task-number: QTCREATORBUG-3485
2011-01-14 15:45:53 +01:00
dt
f987eccd28 Revert "QmlApp template: Use new 4.7.1 API to enable qml debugging"
This reverts commit 424fcf8c04.
2010-11-10 16:56:39 +01:00
Kai Koehne
424fcf8c04 QmlApp template: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.
2010-11-08 09:43:49 +01:00
Kai Koehne
2ac91abd30 QmlApp template: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.

Reviewed-by: Alessandro Portale
2010-11-03 14:06:44 +01:00
Alessandro Portale
48d726b37e Remove compile warning on Symbian.
Reviewed-By: TrustMe
2010-11-01 19:25:19 +01:00
Alessandro Portale
2a7336b4d6 Move hide implementation of conditional show()
...and do not call it show(), because that is the signature of
a non-virtual base class function. showExpanded() sucks as name,
and hjk, who reviewed this is not convinced.
But showExpanded() is still better than show().

Task-Number: QTCREATORBUG-2979
Reviewed-By: hjk
2010-11-01 19:19:32 +01:00
Alessandro Portale
7d622f1145 Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
  not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources

Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
2010-11-01 17:03:46 +01:00
Kai Koehne
0a8c34d382 QmlApp: Only use QMLJSDEBUGGER define to activate qml debugging
Don't confuse users by two defines they have to comment in when
they just want to 'debug': Instead QMLJSDEBUGGER now activates
both the Js Debugger & and the QmlObserver services. Finetuning
can still be done by using the (undocumented) NO_JSDEBUGGER,
NO_QMLOBSERVER defines.
2010-10-13 16:52:58 +02:00
Kai Koehne
4ab1c88ba0 QmlJSDebugger: Split library up into a debugger & observer part
This allows us to enable/disable the experimental observer, independent
from the core javascript-debugger functionality.

Reviewed-by: Christiaan Janssen
2010-09-22 15:44:48 +02:00
Kai Koehne
9107f0c5d0 QmlJSDebugger: Change namespace from QmlObserver to QmlJSDebugger
The library not only contains the observer part, but also the javascript
debugger. Reflect this in the namespace.
2010-09-22 15:44:13 +02:00
Christian Kandeler
1507b5b4e1 QML wizard: Remove remains of dummy data loading.
The GUI part of this has been removed already.

Reviewed-by: Alessandro Portale
2010-09-21 16:32:30 +02:00
hjk
6bc11283ea qmlapplicationviewer: move platform-dependent code out of sight. 2010-09-20 13:29:25 +02:00
Kai Koehne
a10b26920b Qml: Replace 'inspector' by 'observer'
We should restrict ourselves to calling all qml debugging support
observer, instead of mixing qml debugger / inspector / observer
interchangeably.
2010-09-16 16:22:31 +02:00
Kai Koehne
832f6889b5 QmlJSDebugger: Replace namespace QmlViewer with QmlObserver 2010-09-16 16:22:31 +02:00
Kai Koehne
b7384af062 QmlStandaloneApp: Fix template to use new QDeclarativeObserver 2010-09-16 15:48:00 +02:00
Kai Koehne
63cae2981b QmlJsDebugger: Replace QDDesignView by QDViewObserver
Don't force users to inherit from QDeclarativeDesignView. Instead we're
using now event filters to let a user attach a QDeclarativeViewObserver
object to a QDeclarativeDesignView.
2010-09-15 14:18:39 +02:00
Christian Kandeler
e9cf4e0e42 QML Wizard: Orientation support for Maemo5.
Reviewed-by: Alessandro Portale
2010-09-10 13:58:19 +02:00
Christian Kandeler
68f13d3f9a QML Wizard: Let executable find its QML files on Linux.
Reviewed-by: dt
2010-09-08 17:54:02 +02:00
Alessandro Portale
071400d6bb Improved (and simplified) the stub directory structure
- Removed the "cpp/" dir
- Moved main.cpp and symbianicon.svg next to the main .pro.
  This also reduces the dir depth in the project view.
- Introduced "qmlapplicationviewer/" dir, which will contain the files
  which the user should not modify. All the files there have the base
  name "qmlapplicationviewer"
- Moved/renamed "qmlapplication.pri" to
  "qmlapplicationviewer/qmlapplicationviewer.pri"
2010-08-25 19:08:15 +02:00