hjk
066efcd6a6
Debugging on Android
...
This implements the host side of
https://codereview.qt-project.org/#change,50290
Change-Id: I13c7df29534a2a85202c2b295b139896443b0120
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com >
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
Reviewed-by: BogDan Vatra <bogdan@kde.org >
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-04-08 12:05:44 +02:00
Oswald Buddenhagen
1fda2111d4
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370
Incremented year in copyright info
...
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-01-29 16:27:03 +01:00
BogDan Vatra
b57e37243d
Fix AndroidRunner stop action.
...
When the stop button was pressed nothing happened
Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2013-01-24 12:20:30 +01:00
BogDan Vatra
57738988f2
Remove useless warning dialog.
...
Redirect the errors to the application output window.
Change-Id: I927fae72a53314d0200ffbd13c68900d15259cf9
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2013-01-21 11:25:08 +01:00
BogDan Vatra
674ec5efa9
Send static_init_classes paratemer to Android application
...
Change-Id: I3eba3413464bd0e503f24817769bd3062be0eeb2
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2013-01-17 12:11:22 +01:00
Oswald Buddenhagen
65c169c80e
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidrunner.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
2013-01-16 16:46:03 +01:00
BogDan Vatra
0f026bd9d2
Fix crash when pressing stop button
...
Change-Id: If1902153404c49516cf4e535655dbbb5a8135b1c
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2013-01-15 18:45:03 +01:00
Ray Donnelly
7857b9c955
Remove AndroidRunner::asyncStop; always stop synchronously.
...
Change-Id: Ide262b32146cca6abdb59c26969deb64f255cf10
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2012-12-13 12:16:41 +01:00
hjk
386ca7c8dd
Adjust license headers
...
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2012-10-05 17:12:56 +02:00
hjk
bab670af67
android: code cosmetics
...
Fix whitespace, capitalization, naming, comments, add 'using'
in .cpp, remove 'using' in .h, remove unneeded Q_UNUSED, add
needed Q_UNUSED, etc.
Change-Id: Ibf9ba57850cbea1e79e152ec0165c8b01fa66567
Reviewed-by: hjk <qthjk@ovi.com >
2012-08-12 22:40:41 +02:00
Eike Ziller
e0e8cf3ada
Contact -> qt-project.org
...
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-19 13:23:21 +02:00
Tyler Mandry
fcd01af143
Android: Add QML debugging support
...
Change-Id: I2fb2c75001569385e417ea44ae90d34e92a22449
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com >
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-07-17 23:47:31 +02:00
BogDan Vatra
50e8f7bb7b
Android plugin
...
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com >
2012-04-24 12:25:40 +02:00
