con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Kai Koehne
17d11b7be3
Update qmlobserver with latest qmlviewer patches
...
Update qmlobserver with changes in qmlviewer until 376e636eccedb8d8bb.
2010-12-10 13:25:26 +01:00
Kai Koehne
d2ed221b1b
QmlObserver: Add 'show app on top' switch to creator + qmlobserver
...
This is convenient especially in the observer mode.
Reviewed-by: Christiaan Janssen
2010-11-23 16:24:23 +01:00
Kai Koehne
8b59a52bc1
Revert "make compile against 4.7 mainline"
...
This reverts commit 110c58d09e
2010-11-19 15:52:11 +01:00
dt
4ac7253205
Merge remote branch 'origin/2.1'
...
Conflicts:
share/qtcreator/static.pro
src/plugins/cppeditor/cppeditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
src/plugins/qt4projectmanager/qtoutputformatter.cpp
src/plugins/texteditor/generichighlighter/highlightersettings.cpp
2010-11-10 17:02:40 +01:00
Kai Koehne
3d758f12c4
QmlObserver: Fix compilation if no private headers are installed
...
Use the copy of the qdeclarativedebughelper_p.h that we have in
qtcreator instead.
Reviewed-by: Christiaan Janssen
2010-11-09 12:40:06 +01:00
Bill King
110c58d09e
make compile against 4.7 mainline
2010-11-09 14:53:21 +10:00
Kai Koehne
26f79571e6
QmlObserver: 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 ...
Reviewed-by: Alessandro Portale
2010-11-03 14:07:16 +01:00
Kai Koehne
665527346c
QmlObserver: Fix "Waiting for connection ..." message box on exit (Windows)
...
Disable the message box feature alltogether: Debugging output should be
captured by QtCreator already.
Task-number: QTCREATORBUG-2748
2010-10-15 12:54:07 +02:00
Kai Koehne
8162839827
QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver
...
Make Observer and JSDebugger orthogonal.
2010-10-13 16:52:58 +02:00
Kai Koehne
5532f939b5
QmlObserver: Fix compilation if no private headers are installed
...
Don't support the Recording + Test Script features if there are
no private headers installed.
Reviewed-by: Lasse Holmstedt
2010-10-06 14:59:25 +02:00
Lasse Holmstedt
96d991bbdc
QML Observer: Build together on runtime with debugging tools
...
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.
Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
