Commit Graph

3443 Commits

Author SHA1 Message Date
hjk
9ae2ce7629 ProjectExplorer: Drop LocalApplicationRunConfiguration
The functionality can be provided by producing a suitable Runnable
in the derived classes directly.

Change-Id: I7b8e8fe33fffd2b00176b6cf6633eca4e152e466
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-26 10:09:29 +00:00
Tobias Hunger
fe944e47e7 CMake: Simplify code a little
Change-Id: Ifdfac9bb844c9ab201378a6047714ab64ccebd66
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-22 12:34:42 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Eike Ziller
fc485e6b86 Add default implementation for IDocument::fallbackSaveAs(Path|FileName)
The methods are only relevant for documents without a filePath, and
there was a mix of different irrelevant implementations present in
subclasses.

Change-Id: I4f57d306e5ddd913974cfe6ed0b4db062eb907a1
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-19 07:55:56 +00:00
Eike Ziller
cfc89a685e IDocument: Rename defaultPath and suggestedFileName
To fallbackSaveAsPath and fallbackSaveAsFileName. That makes it clearer
what they are for, and that they actually belong to each other.

Change-Id: Ie5b83b9db77d39a7fe9e979cc8f22b7f5b9101a3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-14 14:40:45 +00:00
Marco Bubke
ddd1d4c9cc CppTools: Remove cpptools/cppprojects.[h|cpp]
Change-Id: Ida0e8552d371972c141cf561b28667f4428c6fff
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:47:27 +00:00
Leena Miettinen
67ca818e5b CMake: fix grammar in error message
...for CMakeRunConfiguration

Change-Id: I6b977f6ea2fe3b1aa75de497a93edc6256038a9e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-12 10:27:53 +00:00
Tobias Hunger
65d17272ad CMake: Change PreloadKitInformation to work on Utils::FileName
Change-Id: I717fa8a5c3b308e237acd004fd69df2ba299a938
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-12 10:24:31 +00:00
Tobias Hunger
f539ff1fcf CMake: Document all arguments passed to cmake
Do not leave out -Csomething (set by the kit) or the generator used
(set by the wizard).

Change-Id: I41cfb935da2877deaa26ae84bfdd96948fa20763
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-11 15:33:41 +00:00
Tobias Hunger
d144ea58e0 Project: Add setRootProjectNode method
Add setRootProjectNode method and a default implementation of
rootProjectNode to Project. Use that in all derived classes.

Change-Id: Id28cde04457a20a8963d43020785ef9d77fea57c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-11 15:33:26 +00:00
Tobias Hunger
219b2d9c16 Project: Do not save filenames in derived classes
Change-Id: I23960c61676e96c429b59ad8f8247e1b88606b1a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-11 15:33:11 +00:00
Tobias Hunger
21d204ad5c Project: Add setProjectManager method
Implement default projectManager method in Project and use
these two everywhere.

Change-Id: I27e011e6fdc17b36aff1b8b931527307320e347c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-11 15:31:04 +00:00
Tobias Hunger
b386dd0e99 Project: Add setDocument method
Add setDocument method, implement document method, use this in all
projects.

Change-Id: I5018bf7c2739665c13eee340184ce7c41fd319bb
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-11 12:18:11 +00:00
Tobias Hunger
8146402e05 CMake: Use Qt5-style connects
Change-Id: I5ec451b55237fcceca86f0134ae081b435dab5c5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-08 13:33:44 +00:00
Tobias Hunger
1d6c960f05 CMake: Avoid passing CMakeManager around
Change-Id: I96d7f3785767d1d56ca27a2d0af778edf98d63e1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:50:26 +00:00
Tobias Hunger
53597087c7 CMake: Inline method that is used only once
Change-Id: I1e7d728d0e35f9709b6e04cb2332ebc4487fd0f2
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:50:20 +00:00
Tobias Hunger
1b224a0707 CMake: Order preloadcache after cmake in the kit display
Change-Id: Ibf131198b59ac489fe2c008b518e4df6731a287a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:50:08 +00:00
Tobias Hunger
b2b6d3c526 CMake: Semi-automatic cleanups
* Shorten header guards
* Use override and auto where possible
* Remove useless destructors, etc.
* Remove private slots sections, unify private: sections
* Use member initialization where it makes sense

Change-Id: I00eaf6d706adc16859176d1b68c631d3336bb39f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:17:41 +00:00
Tobias Hunger
079448d342 CMake: Document arguments used to run cmake with
Just add a line of text with the cmake that is being run, the
arguments passed to it and the build directory. Mostly as a help
to debug.

Change-Id: I5ebcac83ddeadf1fc79391b92a83926bff2ea9b2
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:17:37 +00:00
Tobias Hunger
fcb52c4074 CMake: Remove unused member from CMakeBuildConfiguration
Change-Id: I2a4dda889400ad48fbcd8ed25fe583eac34fbaa0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:17:33 +00:00
Tobias Hunger
e26617c3ed CMake: Simplify setup of CMakeOpenProjectWizard
The information is contained in the BuildInfo, so there is no
need to provide it a second time.

Change-Id: I512d148e36996130fab6d8e007dd16d5acebaebb
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 12:17:24 +00:00
Tobias Hunger
d63186d6f4 CMake: Fix build again.
Change-Id: I59ce809357b8f105009a210a5bce0a5d773ad649
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-08 10:32:39 +00:00
Tobias Hunger
ad6c5db3eb CMake: Simplify code a bit
Change-Id: If16aed7a361a00a308570bdafc19ab5c6bb59e36
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-08 10:12:14 +00:00
Tobias Hunger
a456374088 CMake: Only offer kits with a cmake set up!
Change-Id: Icb4b539e009c9dc5bdf40f8d8b887bb65755b48b
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 10:12:08 +00:00
Tobias Hunger
234509a48d CMake: Sprinkle overrides over CMakeProject
Change-Id: I28f9d533597c80e3dc4960c199d07eb1d6951490
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 10:12:01 +00:00
Tobias Hunger
025f548b6e CMake: Make CMake build configuration widget look more like others
Change-Id: Iaed519d4d7e73d8fe313ba2c9028db702e59d7dc
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 10:11:49 +00:00
Tobias Hunger
1aa0b15096 CMake: Clean up CMakeOpenProjectWizard
Change-Id: Iffa47255df160da86717dde3c3333c204945c179
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 10:11:35 +00:00
Tobias Hunger
4756fbbfec CMake: Do not bother to remember ninja support status
Do not bother to remember ninja support status now that it is no longer
used.

Change-Id: Ief24af8e39ad5e39633ccb6d31858fa003de5ce8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 10:11:24 +00:00
Tobias Hunger
870cfdf011 CMake: Use "cmake --build" to build
This removes the need to know about ninja and make in the cmakebuildstep.

Change-Id: Id3a15c34f4a8003c3cbf9d62f246bd08f0ada264
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-08 10:11:12 +00:00
Tim Jenssen
81ffd98433 fix msvc2013 builds
Change-Id: I80771fa02a0817c835eebbf0f550536ecacbd98c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-08 10:10:59 +00:00
Tobias Hunger
33c0b69326 CMake: Use algorithm in CMakeBuildStep
Change-Id: I7d3f5e08b15d91759a9c816dd1223bf8be8c40f8
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-08 08:47:01 +00:00
Tobias Hunger
e4cdad309d CMake: Move MakeStep to CMakeBuildStep
Change-Id: I2a3432acd90cc27fb444ab30c3239497a51e01df
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-08 08:46:58 +00:00
Tobias Hunger
2ce52e3288 CMake: Use "clean" target
Use the "clean" in the MakeStep to clean up.

Change-Id: I7da29866a7dfc6debd70e83cc61f89b809a81cac
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-08 08:11:44 +00:00
hjk
8150209ff7 Analyzer: Slim down AnalyzerStartParameters
* SysRoot can always be determined from kit.
* Pass around RunMode as extra parameter
  not as part of AnalyzerStartParameters.
  That's closer to the pattern used elsewhere.
* Environment was always initialized from the runconfig's
  EnvironmentAspect. The tools can do that directly.
* Provide setter for display name for cases where
  it is not equal to RunConfiguration::displayName

Change-Id: I811a0d7cdeb55cc37a16a593b3942abb567a2150
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-01-07 18:11:09 +00:00
Tobias Hunger
5419b02058 CMake: Make sure there is a "clean" target
Change-Id: I9e3eb49b7f5a2d7d5c89a53969c4703b3ce99330
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-07 12:55:35 +00:00
Tobias Hunger
2b69693828 CMake: Store project name in root node
Store project name in root node and remove the member variable
that was used for this purpose from the CMakeProject.

Makes sure the same name is used more consistently.

Change-Id: I2b60a15143934bdeffe6c744fd300be7e81c674e
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-07 10:37:00 +00:00
Tobias Hunger
bbed47b646 CMake: Remove some repetitions
Change-Id: Ie3dc64cb311a2df297dca63f7eb369e749046cf3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-07 10:36:54 +00:00
Tobias Hunger
6a17eafa05 CMake: Use Utils::algorithm
Change-Id: I6d15c9e68c2e9680668509022d8a771e4c7c595a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-07 10:15:40 +00:00
Ulf Hermann
419b2951fd Cmake: Fix problems with QString / Utils::FileName conversions
Change-Id: I47acade7b240b622ef7e49155700c1240f7ce70c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-06 15:48:48 +00:00
Tobias Hunger
c943ab2d30 CMake: Convert open project wizard to Qt5 style connects
Change-Id: I20dd8ef450883eb559def9b3348d807981a52048
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:03:57 +00:00
Tobias Hunger
11aff016fd CMake: Convert BuildSettingsWidget to Qt5 style connects
Change-Id: I8471196f08f99084dcd3b8173f4528ed6d3e305f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:03:04 +00:00
hjk
e5b9e819fa CMakeProjectManager: Use WorkingDirectoryAspect
This mimics the relevant parts of QbsProjectManager.

Change-Id: I31257556ce0fcc714f6fac26f9d0b88ca6cb076b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-12-17 11:16:07 +00:00
Tobias Hunger
19ee414446 KitConfigWidgets: Use override
Use override on all virtual methods implemented by classes derived
from KitConfigWidget.

Change-Id: I050a9dbfd79b3ebe73af712b71d855a85f332928
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 09:46:56 +00:00
Tom Deblauwe
e8503fa0a3 CMake: Add current run configurations' name to make step
This allows to conveniently only build the code you are
going to run. This is nice to use when you are developing
only a part of a bigger CMake project.

Change-Id: Ia430349fa655409f98620e86adaccb6e60044b4b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-01 11:13:16 +00:00
Alessandro Portale
033862f305 Themed Icons: Introduce Utils::Icon
Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.

Icons are now listed in per-plugin *icons.h headers.

RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.

Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 12:30:52 +00:00
Tobias Hunger
79f82d0d0a BuildManager: Provide context of earlier build steps to init
This information can be used to get information from earlier steps,
which e.g. queried for android devices to deploy to.

Change-Id: Iefe1c9443915cb6211f86f98ff7aaf3cb75145ba
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 14:04:59 +00:00
Tobias Hunger
a110abeed7 Remove unnecessary destructors
Change-Id: Id0bc2d3a305e6af24838266195ab22e04e3a12a1
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 11:16:17 +00:00
Tobias Hunger
0e278e9efe ProjectConfiguration: Sprinkle override and explicit over the code
Change-Id: I2aa3a32a0d30f1d122977d94d4109227dea6bbd7
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 10:14:32 +00:00
Tobias Hunger
ca29cbfc8a Consistently use Utils::FileNameList
Consistently use Utils::FileNameList in favor of QList<Utils::FileName>

Change-Id: Iafbb466c882bfd91c25c9e78f107d401bfdb6d55
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 08:33:02 +00:00
Tobias Hunger
5d7f5a2a32 ProjectNode: Rename path() to filePath()
Change-Id: I78bb73f8c9457fd74c470eacbf54eb9195ac9681
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-03 11:01:50 +00:00