Kai Koehne
1bca3e966d
QmlJSDebugger: Merge back changes done to the files in qtdeclarative
...
Change-Id: I722b191035757c60ce103edf74517f5348a91955
Reviewed-on: http://codereview.qt.nokia.com/3945
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com >
2011-09-01 08:53:39 +02:00
Eike Ziller
bf8cb5d4fc
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
qtcreator.pri
Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
2011-08-16 10:21:55 +02:00
Kai Koehne
929d1aa042
QmlDebugging: Fix on-device debugging for people with a default proxy
...
Qt Creator by default honors the proxy settings of the environment.
This is the wrong choice when connecting to your device, leading to
'Cannot connect to in-process debugger' errors.
Change-Id: Ie0b822dec601463ba3a620efe1a1e35bb24b6c5a
Reviewed-on: http://codereview.qt.nokia.com/2846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2011-08-11 11:25:04 +02:00
Kai Koehne
bb41109b0e
QmlJSDebugClient: Fix style & indentation
...
Change-Id: I87bdb465816fc68f83f6c5e097c9d9b853614b94
Reviewed-on: http://codereview.qt.nokia.com/2672
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com >
2011-08-05 12:17:16 +02:00
Kai Koehne
289acee78a
QmlDbg: Fix behavior when re-running the same run control
...
Change-Id: Icb405b4751fc885d8b96d1daec3653236b564ef0
Reviewed-on: http://codereview.qt.nokia.com/2352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com >
2011-07-29 15:07:43 +02:00
Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
Friedemann Kleint
422f4f688a
Fix compiler warnings.
2011-04-13 08:50:56 +02:00
Tom Sutcliffe
48fef07a08
Added some support for QML debugging over USB. Fixed some issues with -qmljsdebugger option.
...
Not fully working over USB yet, there are some handshaking issues that need to be addressed. WLAN might be improved due to the -qmljsdebugger fixes, but not tested.
2011-04-12 16:33:02 +02:00
Thorbjørn Lindeijer
7741db1220
Code cosmetics
2011-02-16 11:36:06 +01:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Christiaan Janssen
4790548216
QmlDebugger: Refactored QmlEngine and QmlCppEngine
...
Reviewed by: hjk
2010-11-15 17:18:00 +01:00
Kai Koehne
141ca58827
QmlJSDebugClient: Update library to latest changes in qt
...
Protocol / classes changed with commit fd9771c29d
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:39 +02:00
Olivier Goffart
f3cdbeff63
QmlJsInspector: remove private header dependencies
...
A copy of the client debugging code is made in src/libs/qmljsdebugclient/
(this comes from the qt code from commit 65642dd343bf61)
So the qmljsinspector plugin does not require anymore Qt private headers.
2010-07-29 14:36:11 +02:00
