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
