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
Eike Ziller
3ace54406b
Reduce dependencies of CppPreProcessorDialog
...
It doesn't really need a CppEditorWidget
Change-Id: Ic36b1d467460cdcdce372df2887033bd9f5fff29
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com >
2014-01-07 09:40:40 +01:00
Nikolai Kosjar
a8e7b6bd38
CppEditor: Use the project part chosen with CppPreProcessorDialog
...
...otherwise the CppPreProcessorDialog is only semi-useful.
Change-Id: I6b80967b05e7c9a51cd78ae064a3d78170948e32
Reviewed-by: David Schulz <david.schulz@digia.com >
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-12-16 10:32:26 +01:00
David Schulz
10f42df8b3
CppEditor: Remember project in preprocessor dialog.
...
Change-Id: If226707541b1fd4d5c22de2795fb39bc333cfa49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com >
2013-10-22 07:38:24 +02:00
David Schulz
a4ddbd5b2f
CppEditor: Show scrollbar in preprocessor dialog as needed.
...
Change-Id: I88493d24a13b67b0768664db0504ce62d0a101aa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com >
2013-10-18 12:26:13 +02:00
Nikolai Kosjar
3a701d0aa5
CppEditor: Sort project parts in CppPreProcessorDialog
...
Change-Id: I6184eaede3b89933d4ac54a18004319409e72347
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-10-18 11:07:56 +02:00
David Schulz
f30bd48b58
CPPEditor: Rework preprocessor addition tooltip.
...
Change the preprocessor popup to a dialog.
Save the additional preprocessor directives to the session instead of the
.pro.user file.
Change-Id: I0d08c5684cfb21e822cde0a965c9cf14e5d6d47d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com >
2013-10-17 15:25:15 +02:00
