waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.
Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
With this patch it is possible to specify QML_IMPORT_PATH in
CMake projects and QtCreator will scan those paths.
One only has to make sure that the variable which is set in the
CMakeLists.txt is also added to the CMakeCache.txt
Task-number: QTCREATORBUG-11328
Change-Id: I11c7694806664d3203d855983e7db4a89fac267d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Do not forget to build the current executable target when there is a change
of available build targets.
Task-number: QTCREATORBUG-16131
Change-Id: I7fb0dfcd06cdbe3d23dbd194ed27fd3825068c62
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Remove the finished() signal that is (sometimes) used to report that
a buildstep is done and use the FutureInterface for that purpose
consistently.
Change-Id: Ibe5520b562b91f1a7f4fc73ee898b33b930029ec
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Use those functions instead of repeating code all over the place.
Change-Id: I03161663b4d5c538fb2ea667353ab7846373ad81
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Read STATIC types, but never write them out to the user. They are
still useful for Creator-internal sanity checks.
Change-Id: I8a13820291378de2370761be537f78fba1e45a0f
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Make sure there are no empty strings returned by null configuration
items visible in the output.
Change-Id: I467f33f41b8eeb25b6cb2b1aa3ada4dd7e1d5950
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
CMake does change the EXTRA_GENERATOR without having to clear the
configuration. So do not do that anymore.
Change-Id: I09a8ee32e3e2577381fbfb86d55caa75c43c5bf2
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Do not add broken configuration items read in from the .user file.
Change-Id: Ia4372d040456252fdd0750b597777979ad568ca6
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Add a VariableChooser to the configuration widget of a kit's cmake
configuration.
Change-Id: I4096905b831b069a26779fdb16fbede218d69a92
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Do clean the cache when necessary. The logic used to be wrong in that
it sometimes would just force a reparse where a cache clean was necessary.
Change-Id: Ice5e3bceaea83d4fd4d7c2ae6e21e76118e2d2c0
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Add a reset button to the CMake configuration edit dialog that is
available in the kits configuration panel. It restores the default
value for the kit.
Change-Id: I89921e2c86cbf8d9658a32fe5fa51dc2f903ff00
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
CMake does not know whether a build target was configured out of the
current build or removed entirely, so implement the relevant marker.
Mark all of the "vanished" RunConfigurations as disabled.
Also remove one unnecessary level of indirection when setting up
RunConfigurations.
Change-Id: I30a21581823b4bff5a5be29480e64423b9379983
Task-number: QTCREATORBUG-15950
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
No behavior change is intended in this patch.
Change-Id: I5c49a0a97ede443dbb25bf34b96c346a63f549d2
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
...to be consistent with the capitalization elsewhere.
Change-Id: I947e2a5bff3a368ee9a456261186325821870552
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This still fixes the parsing issue when switching build configurations,
but the code is simpler.
Change-Id: I5748788224c5b49399550c33bcef592f193cfa8a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
It makes no sense to not parse if we never parsed before. This got
broken when I tried to reduce the number of cmake runs.
Change-Id: Id70a6550faf248cc983b61f6d2456a93d8454a50
Task-number: QTCREATORBUG-15927
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
CMake will silently ignore all but the last target (or fail to build
anything). This allows to simplify our code.
Change-Id: Ieee3931aca0788307107e2021d507073ef42a21f
Task-number: QTCREATORBUG-15928
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
On windows we got false negatives due to one path starting with "C:" and
the other with "c:". Use Utils::FileName which should do the right thing.
Change-Id: I7dcf8ad3f61caca7ac7c183d492ebfd57fe1b669
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
They don't have signals, properties or translatable strings.
Change-Id: Id27df47d1fb8d0530fdf0f5f0d33a2e7b70360af
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Setting CMake configuration to the provided by the Kit, drops all users
settings to the default one. CMAKE_BUILD_TYPE too.
Change-Id: I8be556f553376273933872a74e47937df5a74f30
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This fixes the several progress bars from popping up when creating a
cmake project via wizards.
Change-Id: I1d61e74db8a190afd6302cd56f141e08e521a587
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This should stop messages about processes still running when cleaning
up the directory on windows.
This also makes sure the progress bars are closed again.
Change-Id: Ic3e94efc8bdecca35437987e0647284cb48af121
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Use macros. This makes it possible to address the current qt version
and toolchain without having to update those values all the time.
This significantly simplifies changing Qt versions and toolchains in
the kit as well as the code itself.
Change-Id: I35128eebdc96fe6175f565b2e9bdaa40862516a7
Task-number: QTCREATORBUG-15830
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
...that passed to the build tool (cmake --build...)
and specified by user.
Change-Id: I0de51161b5dd700f3160f048fa6f02743a5186e6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
The lines with "[x%] Building something" do not contain errors,
so there is no need to parse them (causing false positives to show
up).
Change-Id: Iee87deb73db9e82040cab5401b74c70be91e6191
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
