Eike Ziller
236ea9efb9
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
share/qtcreator/debugger/dumper.cpp
share/qtcreator/debugger/dumper_p.h
share/qtcreator/debugger/test/main.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.h
src/plugins/debugger/lldblib/guest/main.cpp
src/plugins/debugger/lldblib/ipcengineguest.cpp
src/plugins/debugger/lldblib/ipcengineguest.h
src/plugins/debugger/lldblib/ipcenginehost.cpp
src/plugins/debugger/lldblib/ipcenginehost.h
src/plugins/debugger/lldblib/lldbenginehost.cpp
src/plugins/debugger/lldblib/lldboptionspage.cpp
src/plugins/qbsprojectmanager/qbsstep.cpp
src/plugins/qbsprojectmanager/qbsstep.h
src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
src/plugins/qnx/blackberrycheckdevmodestep.cpp
src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863
Incremented year in copyright info
...
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-01-08 08:29:47 +01:00
Daniel Teske
b20ed0a0f3
Android: Fix rerun icon
...
Task-number: QTCREATORBUG-10850
Change-Id: Ic6ac01b1aa57b99fed899c3d9c6e6663b397afc5
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2013-11-20 16:13:06 +01:00
hjk
ebcd992577
Rename namespace Qt4ProjectManager to QmakeProjectManager
...
First step towards plugin renaming.
Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-10-16 12:09:59 +02:00
Aurindam Jana
24af63ec4b
Android: Add QML profiling
...
Change-Id: Ie06c0b49707f8ec549f180f41c565fd223240186
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-05-06 13:27:50 +02:00
Friedemann Kleint
dbcf8f4e42
QtSupport: Forward-declare some classes.
...
Change-Id: I7f0eb6c4ea8620c8405f6d13c554c0ec913edd63
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2013-03-27 12:51:30 +01: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
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
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
hjk
386ca7c8dd
Adjust license headers
...
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2012-10-05 17:12:56 +02:00
Leena Miettinen
fa9dbd3bf6
Android: check UI text for style and grammar
...
Change-Id: I8b808cf374fcdc124c5b2b7d9a113e6d64b17f2f
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com >
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
2012-10-01 09:55:18 +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
Robert Loehning
ac8150624a
Improved translated strings
...
Change-Id: I92e2a87d063894d4992451ee0e9fe2a99d298eb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2012-08-02 08:52:05 +02:00
Robert Loehning
ed7c80d4c6
Normalized connect()s
...
Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99
Reviewed-by: hjk <qthjk@ovi.com >
2012-07-26 16:12:43 +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
