aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/qtsupport.qbs
Commit message (Collapse)AuthorAgeFilesLines
* QtSupport: Fix Qbs buildChristian Stenger2020-01-101-0/+1
| | | | | Change-Id: If818b7d40b9e91d4176aeb5935a60aca469953dd Reviewed-by: David Schulz <david.schulz@qt.io>
* QtSupport: Add a QmlDebuggingAspectChristian Kandeler2019-11-251-0/+2
| | | | | | | | | ... and make use of it in the qbs build configuration. We cannot use it for qmake yet, because the build config there still has a custom, non-aspectified widget. Change-Id: Iacf902a2d9384d0074b10fdc98e082fa906fb6d6 Reviewed-by: hjk <hjk@qt.io>
* QtSupport: Remove dependency on CppToolsEike Ziller2019-09-121-1/+0
| | | | | | | | | It was only left for the C++ category for the Qt class generation settings. Change-Id: I22d3f198f7b825c4a36d08d4ee28091b9e5b1f43 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* QtSupport: Delete empty source file qtversionfactory.cppOrgad Shaneh2019-09-031-1/+0
| | | | | Change-Id: Ib01e08d4a4344f33530ac1094866742890334ea9 Reviewed-by: hjk <hjk@qt.io>
* RemoteLinux: Move EmbeddeLinuxQtVersion to QtSupporthjk2019-08-161-2/+2
| | | | | | | | The class uses only one ID from RL at compile time, and after the move RL does not hard-depend on QtSupport anymore. Change-Id: I9f8aa6782e45fe998d83ddcc5323c396964bf1fe Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtSupport//ProjectExplorer: Move DesktopRunConfiguration implementationhjk2019-08-151-2/+0
| | | | | | | It does not depend on QtSupport anymore. Change-Id: Ib2db6832fbc08d8893b362224372ef47df10ee7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt wizards: Include translation file, if requestedChristian Kandeler2019-08-081-0/+2
| | | | | | | | | Provide all wizards for Qt-based projects with the ability to set up a skeleton .ts file and add it to the generated project. Task-number: QTCREATORBUG-7453 Change-Id: I4dfb34c0101062edd0209173f83737e69063e27a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Unification of desktop run configurations, step 1hjk2019-08-071-0/+2
| | | | | | | | | | | | First step, move {DesktopQt,Qbs,CMake}RunConfiguration{,Factory} into the same new files. This only moves down to QtSupport, not ProjectExplorer, as there are in all three cases direct dependencies on QtSupport. Long term I would expect them to move further down. Change-Id: Ib16b19df7f3f642ed7f7db89a1f6904601d976ba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtSupport: Add an output parser for QtTestChristian Kandeler2019-03-121-0/+2
| | | | | | | | | This is useful if you have e.g. a "make check" build step or a qbs autotest runner. Fixes: QTCREATORBUG-8091 Change-Id: Ie4efc8ce3a643d8ec53f2ef1f155cc0989985ab1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-02-201-0/+6
|\ | | | | | | Change-Id: I0d3db14e583628b906d7fdeb800e004d98e52632
| * qmake: add $$read_registry() functionChristian Kandeler2019-02-191-0/+6
| | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-21973 Written-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry-picked from qtbase/f89ac0101ad4a6cb5339a3bfe132aad897eafc9d) Change-Id: I6f67eec7c715686074dd3bdc121170c26daf56da Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | QtSupport et al: Move QtVersionFactory to *QtVersion implementationhjk2019-02-181-2/+2
| | | | | | | | | | | | | | At most a dozen lines each left. Change-Id: Ifbf34f814266ba7bee83d3fee9db831eb450dfc4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Move KitAspectWidget definitions alongside their KitAspectsChristian Kandeler2019-02-111-2/+0
|/ | | | | | | | | | A KitAspectWidget class is tightly coupled with the respective KitAspect, and no one else ever needs to see any KitAspectWidget subclass at build time. Change-Id: I1883af3b054c225e1ff5dd913118715bfdbaacfc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io>
* CppTools: De-duplicate code for CppProjectUpdaterNikolai Kosjar2019-01-101-0/+2
| | | | | | | Centralize gathering the kit, toolchains and qt version. Change-Id: I6bd586ac7925e2ee556fd119f1dab096cd500e41 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtSupport: Fix qbs buildNikolai Kosjar2018-09-251-0/+1
| | | | | Change-Id: Idf4dae85ac254fe151f2571d5139420336f8b122 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ProjectExplorer, QtSupport: Remove wince* sourcesAlessandro Portale2017-06-121-2/+0
| | | | | | | WinCE support has not been maintained since a while. Change-Id: Ieb388f981451a1178e70960f41e9db4bb3c789f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* PE/QtSupport: Remove some Quick dependencieshjk2017-01-171-2/+1
| | | | | Change-Id: Ic92813141448a982cb63a6e034a19166dff171dc Reviewed-by: David Schulz <david.schulz@qt.io>
* QtSupport: Introduce QtProjectImporterTobias Hunger2016-09-151-0/+2
| | | | | | | | | | Introduce a base class for importing Qt projects. This class handles the handling of temporary Qt versions. Use this in the QmakeProjectImporter. Change-Id: I2e540f9bb75d607a68d1277db68243b04eee168f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qbs build: Do not make the ProParser a static library after all.Christian Kandeler2016-06-151-0/+32
| | | | | | | | | | | | | If ProParser is a library, all plugins depending on it (to be able to get at the include paths) will also link to it, but there must be only one instance of its data present. So we go back to building the sources as part of the QtSupport plugin, while the ProParser product is now only responsible for exporting the necessary defines and include paths. Change-Id: I9ad62343064d8aea8ddc4776a462308c4d6ae283 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* qbs build: Fix ProParser dependency.Christian Kandeler2016-06-131-0/+4
| | | | | | | | The dependency is introduced by the QtSupport plugin, not by QmakeProjectManager. Change-Id: Id24b3010fd816162cb839d4a35ab97303eca7a9f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add static library for qmake project file parser.Christian Kandeler2016-06-131-54/+1
| | | | | | | This is needed to build plugins "out of source". Change-Id: If842cde86e1eb54daa3daf7f9d6f27751f657d9e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: More steps toward creating a "development installation".Christian Kandeler2016-06-131-116/+120
| | | | | | | | | | | | | | | Namely: - Install header files. - Install imports and modules. - Create modules from products and install them. This is most of what we need. The main thing still left to do is dealing with paths in Export items. These have to be translated somehow. (Currently we only copy the Depends items out of the Export items and ignore everything else.) Change-Id: I12d49fa31d1c1e05bc77a0e0ce3ec9c78c27192a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Move CustomExecutableRunConfiguration to ProjectExplorerhjk2016-05-131-4/+0
| | | | | | | There's nothing QtSupport specific in there. Change-Id: I616a37ed56f1853cdbb16f483de5682d5ea63715 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* New file overlay iconsAlessandro Portale2016-04-251-5/+0
| | | | | Change-Id: Icba67a1404b6e4604aef56def00bfe2098b8c8fe Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QtSupport: Support qscxmlc as extra compilerUlf Hermann2016-02-161-0/+2
| | | | | Change-Id: Ief4810abe46ce4654f518781ce377e10a8e38ad4 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Generalize support for extra compilersUlf Hermann2016-02-161-2/+2
| | | | | | | | | | | | | | | | Allow for different extra compilers which may get called to generate additional code for the code model. The build system is expected to know what files are generated from which source file and the extra compilers know how to generate the content of those files, without touching the build directory. the uic adapter is refactored to be the first such extra compiler. The extra compiler is run when an editor for its source document loses focus, or after a timeout of 1s when the source document has been changed. Change-Id: I13c110c61120c812f02639a3684144daf8979b37 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add support for qscxmlc and state chart files to project managersUlf Hermann2016-02-091-0/+1
| | | | | Change-Id: Ic0ac337ea90310239a2b1e681083f2201a76afe8 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Removing support for DebuggingHelpersThomas Hartmann2016-01-251-3/+0
| | | | | | | | | | | This patch removes infrastructure and ui for DebuggingHelpers and specifically qmldumptool. The qmldumptool was the last relevant DebuggingHelper and is only required for Qt < 4.8. Change-Id: I3767be0858e5eba16a33a3ab8436e95fc06a9e99 Reviewed-by: hjk <hjk@theqtcompany.com>
* QtSupport: Remove SimulatorQthjk2015-04-241-2/+0
| | | | | | | | Unused for years. Change-Id: I721068ecf18afb09fb928a348cbb5e8127a3dfc2 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Remove aggregation dependency from project filesNikita Baryshnikov2015-03-091-1/+0
| | | | | Change-Id: Idfd3941f47b71d6b84306d88604b744e3585e4af Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Introduce convenience project property sharedSourcesDir.Christian Kandeler2015-02-181-2/+2
| | | | | Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-3/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QtSupport: Fix qbs build.Christian Kandeler2014-09-171-2/+1
| | | | | Change-Id: I4109c870f9b7e14f31796899f833b309e0e9525e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QtSupport: Add codegeneration.h/cppTobias Hunger2014-09-161-0/+2
| | | | | Change-Id: Iec1d4b303e6154b5d2d32e4d3ab7c02893bcc5f1 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Qbs files: Raise Qt requirement to 5.3.1Eike Ziller2014-08-291-2/+1
| | | | | | | Like we have now for the qmake build too. Change-Id: I00a4cc01f35a4d93b52951c5591dadd4b6aa5e79 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* FeatureProvider: Move features into KitsTobias Hunger2014-07-301-1/+0
| | | | | | | | | | | | | | | | Make available features and platforms methods on kits (implemented via the KitInformation). Add convenience methods to KitManager to collect all that. Remove QtFeatureProvider and implement KitFeatureProvider instead. The idea of this patch is to make it easier to find which kits are applicable to which wizard: I should now be able to match the wizard features against a kit and have a good set of kits to choose from. Change-Id: Ie5be0213f142cfdf4417ac55bd6cbb056265a531 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix qbs build.Christian Kandeler2014-07-241-1/+1
| | | | | Change-Id: Iee086eb036b49dccf058b9769b3753395b026cc7 Reviewed-by: hjk <hjk121@nokiamail.com>
* Move code from Designer to QtSupportTobias Hunger2014-07-241-0/+5
| | | | | | | | | * Move settings pages for Qt code generation from Designer to QtSupport plugin. * Make Designer plugin depend on QtSupport Change-Id: I222dac0a648c194ce46fd9f8bbb09c70db851bbd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-111-2/+4
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: Remove support for non-Python GDBhjk2014-01-061-2/+0
| | | | | | | | This affects mainly Apple's version of GDB. Mac users are advised to use LLDB, or some recent build of FSF GDB. Change-Id: I6a7fbb591e79f737e12d08b0e881e9e4d1d9660c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove support for debugging JS with Qt 4.7Kai Koehne2013-11-041-4/+0
| | | | | | | | Remove infrastructure to debug/inspect QML applications with Qt 4.7. Change-Id: I277e9884e009475a29017f502bbe1d069317460f Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Move QtVersionFactory to QtSupport moduleYuchen Deng2013-10-151-0/+12
| | | | | | | | | After this is done, QbsProjectManager/CMakeProjectManager will be able to have full Qt support work without having to depend on Qt4ProjectManager. It's should belong here. Change-Id: I577d47cb8a40eb697aa862fbec36c56ff05004f0 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-2/+2
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qbs warningsOrgad Shaneh2013-09-271-2/+1
| | | | | | | Duplicate dependencies Change-Id: I23e931cd6e75494a8ec7e099b0f2549764e5924b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs project files: Rename defaults.js to functions.js.Christian Kandeler2013-09-191-3/+3
| | | | | | | The old name does not fit anymore. Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qbs build.Christian Kandeler2013-09-191-2/+4
| | | | | | | | There was more stuff broken by the switch to Qt Quick 2 than were originally noticed, and the original fix was buggy as well. Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qbs build.Christian Kandeler2013-09-171-1/+2
| | | | | | | | Commit cf56178d introduced an impressive amount of syntax errors. Change-Id: Ibaf8b8384b06ee92b658b71f08ac8d14e92c19b0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Port welcome screen to Qt Quick 2Jens Bache-Wiig2013-09-161-3/+10
| | | | | | | | This ports the welcome screen to use QtQuick 2.0. I have disabled the plugin on Qt4 builds. Change-Id: Ia921d0747c8f7d4441c88fc9fb77b822496091f4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-021-1/+0
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>