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 |
|
Friedemann Kleint
|
11cc6eb131
|
Fix tr()-messages.
Change-Id: I89bf087e924d7941aaec12bb8f4324df4a93793a
Reviewed-by: hjk <hjk121@nokiamail.com>
|
2013-11-15 12:44:17 +01:00 |
|
Daniel Teske
|
b8c3a79705
|
Android Potential Kit: set a icon
Change-Id: Iabe9a7821b1ac831c62bf52d393a5190dbb2d58a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
2013-10-18 13:12:13 +02:00 |
|
Leena Miettinen
|
e902945b7e
|
Android: fix UI text capitalization and punctuation
Fix typos and style issues.
Change-Id: I8d1bbccd55e7558e7f8a8bedbab95f4bb8a8478f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
2013-10-09 17:50:52 +02:00 |
|
Daniel Teske
|
4c4cceaa49
|
Show potential kits in the targetsetuppage
Change-Id: I6569e3d53b78cdcdf8607a289b5be37447e0a03c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
2013-10-01 12:44:39 +02:00 |
|