delta/qt-creator.git/src/plugins/texteditor/codestylepool.cpp, branch wip/clang

TextEditor: One more missing dialog parent.

2013-11-27T08:35:34+00:00

Change-Id: I9dab955a0b4a0d7d83a69cfc474633be43e7169f
Reviewed-by: David Schulz

CodeStyleSettings: De-noise user code by using QByteArray ids.

2013-09-25T07:43:22+00:00

Change-Id: Ia7210b0ff85667951e4e5554155d89ed6925f9ec
Reviewed-by: David Schulz

Fix Krazy warnings about QString::null/clear().

2013-03-11T13:41:03+00:00

Change-Id: I11faa5af0c186a9126c4af6f86e56250030d6cd9
Reviewed-by: Erik Verbruggen 
Reviewed-by: Laszlo Papp 
Reviewed-by: David Schulz 
Reviewed-by: Jarek Kobus

Merge remote-tracking branch 'origin/2.6'

2013-01-31T15:25:33+00:00

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

Incremented year in copyright info

2013-01-29T15:27:03+00:00

Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne

Replace some const char * with const char[]

2012-11-22T08:36:09+00:00

Change-Id: I7657792d9ebfcaede7b719400d239f837074290b
Reviewed-by: David Schulz

Use Core::Id for language

2012-11-22T07:32:44+00:00

Change-Id: I0077558e9e2cf5aa06ac921cb45224e29aa85c9b
Reviewed-by: hjk

Adjust license headers

2012-10-05T15:12:56+00:00

Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller

Fix saving of code style settings

2012-09-20T12:54:54+00:00

Save the would code style settings structure, not only its part.

Task-number: QTCREATORBUG-7867
Change-Id: I51c90ba372c28d10fb69e17a9845573f9d2d18f9
Reviewed-by: Tobias Hunger

Fix saving of XML configuration files

2012-09-04T12:21:01+00:00

... when removing settings

Change-Id: If85061321082a8cd0e35752f71d2498fd4693dfd
Reviewed-by: Daniel Teske