Commit Graph

66 Commits

Author SHA1 Message Date
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
2013-08-21 14:39:18 +02:00
Orgad Shaneh
15a9019191 CustomToolChain: emit dirty() on changes
Change-Id: I0c9a199562ff6b5953d22d42b28f814e53ffb3d9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-13 09:18:32 +02:00
hjk
d3c299cbe3 ProjectExplorer: Streamline ToolchainFactory interface
Change-Id: I70dba496c4d1eeb9c6767080d179f86f20c1b107
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 16:14:06 +02:00
Andre Hartmann
4bc61ecac4 Custom Error Parser
Allow setting the following items from outside:
* capture regular expression,
* file name, line number and message capture position and
* whether to parse stdout, stderr or both

The parser functions can be unit-tested by running (Debug build of Qt
Creator needed):

qtcreator -test ProjectExplorer,testCustomOutputParsers

The data is passed to the custom parser in
CustomToolChain::outputParser().

The parser information is stored in toolchains.xml together with the
custom toolchain. A configuration widget is provided to set up and test
the regular expression against a sample error message.

Change-Id: I6191df3c44432943e0aeb16c48d8e79d35845d2e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 11:50:08 +02:00
Tobias Hunger
2e004b7367 CustomToolChain: Fix release builds for non-windows
Change-Id: I5f2b73088db2353c7f13875391f11763b66434be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-06 15:15:25 +02:00
Orgad Shaneh
c83cf66d28 Fix compilation
Broken by debfc1718f

Change-Id: If8bb67572ea33c3cde4c3b474e0c37b8ca2f058f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-06 11:26:42 +02:00
Orgad Shaneh
debfc1718f CustomToolChain: Support choosing an error parser
Change-Id: Ida2223d6e3c6577d13aa52827c00e3fa3f44a848
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 10:00:17 +02:00
Sergey Shambir
6faf45a465 ProjectExplorer: extended Toolchain::CompilerFlags
Now it provides information about C language standard and C++
extensions. No new behavior added to project managers.

Change-Id: Ib7c19641f452a75c9b14cd7e33d104dcd1603720
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-30 17:31:22 +02:00
Sergey Shambir
20b5c3b2c8 ToolChain: added warningFlags() method
Converts toolchain-specific flags in QFlags.
Will be useful for ClangCodeModel.

Change-Id: I2cff650c952f7c41d3a27535a27fa52b932a0b92
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-23 11:23:41 +02:00
Friedemann Kleint
665ba57da0 Fix Krazy warnings about includes/header guards in ProjectExplorer.
Change-Id: Ica1df90278f450717b71f7d895c84a31a5596e7c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-12 12:57:53 +01:00
Friedemann Kleint
b2bad5e540 Fix message in customtoolchain.cpp.
Change-Id: Icf48a49330cb39aa04413ac8c54afc7d72e612fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-13 12:49:49 +01:00
Leena Miettinen
c88ed7d690 UI text: edit custom compiler messages
There is no good solution for %n entry(ies).

Change-Id: Ideaa5686c8efd0bb70e54a76f00dfca2e26c7bb0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-13 09:42:46 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-01 09:19:26 +01:00
hjk
189adcc379 CustomToolChain: Fix make command
Change-Id: I11da49b9bb1fe0f5a71f0a1ea684fce486074f21
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-27 21:44:22 +01:00
Friedemann Kleint
ec2076c755 Fix lupdate warnings.
Change-Id: Idef345e12223cf6695ea5af8ee7fa1e51c72be0f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:51:54 +01:00
Orgad Shaneh
c89d22cf7c Introduce custom compiler settings
Following http://lists.qt-project.org/pipermail/qt-creator/2012-August/001168.html
and my own use-case.

Useful for:
1. Old, unsupported compilers.
2. When compilation is done on a remote server (using a post-build command for instance)
   and the compiler is not available on the local machine

Change-Id: Ic2ebdcdd9829efa4a73fb48489c02e4b251c2e33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-12 03:18:12 +01:00