Commit Graph

68 Commits

Author SHA1 Message Date
Eike Ziller
1de74cceab Merge remote-tracking branch 'origin/4.13'
Change-Id: I015bac0cccdf466a923c706abdedd8bd8800b0cd
2020-07-06 10:30:54 +02:00
hjk
430a33dcd9 Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-06 06:07:13 +00:00
Leena Miettinen
3650dd8b42 Meson: Fix UI text capitalization
Change-Id: I6f2efde74f3ca899487b456e7a28d0eef72c5dfa
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-02 11:10:30 +00:00
Christian Kandeler
e9fed0e536 Meson: Fix build with older GCC
Change-Id: I3a3ed1ea65e066e73d3cabb29a8858677197f18f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 12:12:51 +00:00
Alexis Jeandet
bce43c15af Meson: Trivial fix for tests
Meson sample folder was renamed without updating tests.

Change-Id: I95b984b6d18a43e0f570368b76b669376fff4f0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-29 15:25:33 +00:00
Alexis Jeandet
8a2cb794b9 Meson: fix broken project tree on windows
Change-Id: I88d0e5b6f1547d5fa6fe832d26bafee59e535a4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-29 09:12:13 +00:00
hjk
0283c5cab9 Meson: Adapt to FileName deprecation
Change-Id: I68bc2c7532f74b0377a8030efbaa59abcfccec45
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-26 08:28:13 +00:00
Eike Ziller
ba5b1fc8ab Fix filtering in various hierarchical views
The intermediate "category" nodes where never filtered out.

CategorySortFilterModel was changed to use filterRegularExpression() and
setFilterFixedString does not set that (it only affects filterRegExp()
which we need to get rid off).
Set a regular expression directly instead of a fixed string.

Amends 47e576528e

Change-Id: I6f844027b83d66ca2d5088d83e6e84b01b9eda45
Reviewed-by: hjk <hjk@qt.io>
2020-06-22 12:23:12 +00:00
hjk
beee392dd8 ProjectExplorer: Consolidate RunConfigurationFactory::ids
It was already only one id string with two names. Since it is not
an id for the factory but the id of the created run configuration,
settle of  runConfigurationId() as accessor.

The factory and id fields in RunConfigurationCreationInfo were
redundant. factory always implies (runconfiguration)id (but not
necessarily the other way round, in theory different factories
are possible for the same runconfiguration type for different
devices). So drop the id field here.

In one case now factory pointers instead of ids are compared, but
this is neutral there as this happens in a context of a fixed Target,
device and project are fixed there, so id and factory are equally
unique.

Change-Id: I859aa91486a2dd4abfc7369540a3322d6ec6260d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-15 12:13:38 +00:00
Orgad Shaneh
60dab96d39 Meson: Fix issues reported by Coverity
Mostly uninitialized members, and one use-after-free.

Change-Id: Idfc9b0f39733e87e22a97d741cb261e1b09a8815
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-12 09:42:02 +00:00
Eike Ziller
5fcbc55c2c Meson: Hopefully final build fix for older GCC
Amends 77d7bb5014.

Change-Id: I94df369cd8aae7d978ede631103199a3a7cb5b26
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-10 19:36:03 +00:00
Eike Ziller
228568af7a Meson: More build fixes for older GCC
Amends 77d7bb5014.

Change-Id: Ib55feb37db1c66ca162e097fdcab7fe6ad538cf2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-10 11:49:09 +00:00
Christian Stenger
43b6b3d1c8 Meson: Fix compile for gcc 5.3
Amends 77d7bb5014.

Change-Id: Ic613e2b9ddcc0e4b86ed78ddc997c7c40120316c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-10 10:31:06 +00:00
Christian Stenger
f1b7fd81f5 Meson: Fix compile for gcc 5.3
Amends 77d7bb5014.

Change-Id: I8aca3c3a95890ec794a8f0f5cadbc6d726559f49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-09 06:05:06 +00:00
Christian Stenger
059c8edf21 Meson fix compile
Amends 77d7bb5014.

Change-Id: I5c0cb8ed10d70795408236acb240c662d7eddbbb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-09 05:52:56 +00:00
Christian Stenger
e19f8899f5 Meson: Fix compile
Amends 77d7bb5014.

Change-Id: I86bae4f0d0df79f1941e5ab6b4ef097d72a505ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-08 11:29:02 +00:00
Christian Stenger
c88ea7db8f Meson: Fix compile with gcc 5.3
Amends 77d7bb5014.

Change-Id: I1f67754b0a92200d4e526d27aa9ab310625719c0
Reviewed-by: hjk <hjk@qt.io>
2020-06-08 11:21:39 +00:00
Alexis Jeandet
77d7bb5014 Meson build plugin initial support
Most basic project management is implemented:
- Project config/build
- Build options accessible to user
- Lists most build targets
- Meson and Ninja added to kit setup
- Basic project file tree with files known by Meson
- Some basic meson and ninja process output parsing
- Some project templates

Missing features, that will come later:
- Configurable project tree layout
- Locators for Meson
- Build importer
- Access to Machine files for better user fine tuning
- ...

Fixes: QTCREATORBUG-18117
Change-Id: I2811e71562c113fb0fc6b6177bcf0698fa71ef63
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-08 09:55:17 +00:00