Change-Id: Ieb01ee7ecc1ae666e8ff86e92ef3616d71b79338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb
Reviewed-by: hjk <hjk121@nokiamail.com>

Task-number: QTCREATORBUG-8820

Change-Id: If48429fc80d3b928cba4622ff6b168dca8289500
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Change-Id: Idef345e12223cf6695ea5af8ee7fa1e51c72be0f
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I118016956a597ad689daa438f5517a47efe3cef0
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I8ededc392485558ed4327cc2b76e73fba81bf562
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

- Factor out message/tooltips for breakpoints on functions.
- Add stringlist of break functions to CdbOptions.
- Set breakpoints with module, ignore response.

Change-Id: If5cf7647b190057c18d8499b9f4862696610e4f6
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Rename 'Debugging Helper' options pane to 'Locals & Expressions',
and move the two actions for showing/hiding std:: and Qt namespaces
in type name to the page.

Change-Id: If7ec66016b330a4c579597bcc81f1fa5a3eff815
Reviewed-by: hjk <qthjk@ovi.com>

Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

in QSharedPointer.

Change-Id: Ida488ce33a74fe0fc06c31b42e44365f7d038356
Reviewed-on: http://codereview.qt.nokia.com/2347


Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: I2ef319e4556da1b93ae82afd597e0445d1f81d8d
Reviewed-on: http://codereview.qt.nokia.com/1692


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2

Add a new widget to edit the mappings. Rework common options
page to use the standard pattern to allow for complex data types,
introduce GlobalOptions class.

Reviewed-by: hjk

Task-number: QTCREATORBUG-1147

Collisions are now also marked in the standard shortcuts.

It wasn't finding this page when looking for 'shortcut'.

Some categories do not have icons yet, unfortunately.

Merge-request: 125
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

  * Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt

Reviewed-by: Trust Me

Conflicts:

	src/libs/cplusplus/CppBindings.cpp
	src/libs/cplusplus/CppBindings.h
	src/libs/cplusplus/FastPreprocessor.cpp
	src/libs/cplusplus/FastPreprocessor.h
	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
	src/plugins/cpptools/cppcurrentdocumentfilter.h
	src/plugins/cpptools/cppsemanticsearch.cpp
	src/plugins/cpptools/cppsemanticsearch.h
	src/plugins/duieditor/parser/qmljs.g
	src/plugins/duieditor/parser/qmljsast.cpp
	src/plugins/duieditor/parser/qmljsast_p.h
	src/plugins/duieditor/parser/qmljsastfwd_p.h
	src/plugins/duieditor/parser/qmljsastvisitor.cpp
	src/plugins/duieditor/parser/qmljsastvisitor_p.h
	src/plugins/duieditor/parser/qmljsengine_p.cpp
	src/plugins/duieditor/parser/qmljsengine_p.h
	src/plugins/duieditor/parser/qmljsgrammar.cpp
	src/plugins/duieditor/parser/qmljsgrammar_p.h
	src/plugins/duieditor/parser/qmljslexer.cpp
	src/plugins/duieditor/parser/qmljslexer_p.h
	src/plugins/duieditor/parser/qmljsmemorypool_p.h
	src/plugins/duieditor/parser/qmljsnodepool_p.h
	src/plugins/duieditor/parser/qmljsparser.cpp
	src/plugins/duieditor/parser/qmljsparser_p.h
	src/plugins/duieditor/parser/qmljsprettypretty.cpp
	src/plugins/duieditor/parser/qmljsprettypretty_p.h
	src/plugins/duieditor/rewriter/rewriter.cpp
	src/plugins/duieditor/rewriter/rewriter_p.h
	src/plugins/duieditor/rewriter/textwriter.cpp
	src/plugins/duieditor/rewriter/textwriter_p.h
	src/shared/cplusplus/ASTClone.cpp
	tests/manual/cplusplus/main.cpp

Reviewed-by: Trust Me

Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.

Task: 241959, 248085

RevBy: Optics/Naming checked by con
Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings.