delta/qt-creator.git, branch wip/clang

Merge remote-tracking branch 'origin/master' into wip/clang

2013-12-10T11:53:20+00:00

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

Clang: fixed assertion failure in highlighting.

2013-12-10T11:52:23+00:00

Highlighting called asynchronously, and a few lines at the end
of editing file can be deleted for this time. Assertion
failed in debug builds, highlighting failed in release.

Change-Id: Ia15dd27f791fe2721b672eb4528a0b9d3f1831d6
Reviewed-by: Erik Verbruggen

Clang: improved detection of llvm-config utility.

2013-12-10T11:05:23+00:00

Now can detect llvm-config, llvm-config-3.2, llvm-config-3.3,
llvm-config-3.4 and 4 possible future versions.

Change-Id: I0ae1a75c0a0f109ff8fe2a06e256062bf017b565
Reviewed-by: Erik Verbruggen

Clang: disable skipped block “highlighting” through clang

2013-12-10T11:03:18+00:00

The clang patch still is not in yet, so to prevent checking for the
wrong CINDEX_VERSION_MINOR, it is now disabled.

Change-Id: I914d05360551689f7c18ce1bb51ea8f4cb6947eb
Reviewed-by: Erik Verbruggen

Clang: do debug output depending on environment variable.

2013-12-10T11:03:08+00:00

Change-Id: Id7a65fda0e1b24d9167fb055fea3f68abe21e5e1
Reviewed-by: Erik Verbruggen

Clang: option generation fixes.

2013-12-10T11:02:52+00:00

Change-Id: Ic876058cbd0debcc71f812b6c21215b460058968
Reviewed-by: Erik Verbruggen

C++: split defines into project-defined and toolchain-defined.

2013-12-10T10:42:41+00:00

So we can ignore possibly problematic toolchain-defines, while can still
unconditionally apply project-defines.

Change-Id: I7cb96f35a963d080011fe888ef71bfc098dd33ef
Reviewed-by: Nikolai Kosjar

Move markableInterface() to ITextEditorDocument

2013-12-10T08:11:45+00:00

And remove the indirection over BaseTextEditorWidget.

Change-Id: I2c570edf46b9ca72a11704ce27d8ae3f2218dcf0
Reviewed-by: David Schulz

Rename QString ITextEditorDocument::contents --> plainText

2013-12-10T08:11:30+00:00

To differentiate it from the byte array based IDocument::setContents

Change-Id: Icc9600732c2742fb79254a0697870bacce3a59ee
Reviewed-by: David Schulz

Mac: Remove code that was there for 10.4 compatibility

2013-12-10T07:31:06+00:00

Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9
Reviewed-by: Oswald Buddenhagen 
Reviewed-by: Eike Ziller