aboutsummaryrefslogtreecommitdiffstats
path: root/qbs/imports
Commit message (Collapse)AuthorAgeFilesLines
* qbs build: Suppress some GCC 9 warningsChristian Kandeler2019-07-021-7/+11
| | | | | | | | Otherwise, we get thousands of warnings from Qt, e.g.: qvariant.h:275:25: warning: implicitly-declared ‘constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)’ is deprecated [-Wdeprecated-copy] Change-Id: I8b3bbfae6791adca8bcfacc7ad5ab46701474aa4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump minimum Qt version (to build Qt Creator) to 5.11Alessandro Portale2019-02-151-1/+1
| | | | | | | | | Recent adaptations to Qt 5.13's API deprecations require using APIs which were introduces in Qt 5.11. Change-Id: I6c077d824c9ce716e019543b290c355a5d512fad Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Fix regression with qbs 1.13Christian Kandeler2019-02-041-1/+8
| | | | | | | | Don't fall back to pkg-config for non-existing dev headers products, as that becomes expensive. Change-Id: Ibf51a93950e04ee061ca16444fbc18349389d74a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Documentation: Fix qbs buildChristian Kandeler2018-11-141-0/+4
| | | | | | | Amends 1e1c212090 and 54208113ee. Change-Id: I1f15a118b40513382e4e1d5767781865d4458ce9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-132-0/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/settingsaccessor.cpp src/plugins/autotest/autotestplugin.cpp src/plugins/git/gitclient.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.h Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
| * qbs build: Enable the vcs module only for commercial pluginsChristian Kandeler2018-04-042-0/+2
| | | | | | | | | | | | | | | | | | The other ones are in the Qt Creator source tree and should not get rebuilt on repo metadata changes, because they do not make use of QTC_PLUGIN_REVISION. Change-Id: I216a89de4411948b7ccad65f883d0d8782a283d4 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Increase requirement for building Qt Creator from Qt 5.6.2 to Qt 5.9Eike Ziller2018-03-221-1/+1
|/ | | | | | | | | | | | | | Qt 5.11 will be released and Qt 5.9 is the new LTS. Increasing the requirement allows us to remove some baggage and workarounds like Utils::asConst, special Q_OVERRIDE header, and deployment target adaptions on macOS, and simplifies pulling in proparser changes from Qt. Change-Id: I9faf99336d26dd20bd63e6904ae543c0f351aa4d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Synchronize autotest defines in qmake and qbs buildJoerg Bornemann2018-03-191-3/+1
| | | | | | | | | | | Do not remove QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION in QtcAutotest, but in the two tests that won't build with it. In the qmake build the defines are not removed from json.pro, because this file does not include qttest.pri. Change-Id: I97d173528ca2a02bac1bfae30709a959e6b69375 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Use project-global destination dir for libs and pluginsChristian Kandeler2018-02-122-2/+2
| | | | | | | | The autotests' rpath settings expect them there. Change-Id: I13e3b8fb9a65be16e980b8465ff2e89b9e01ec6b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-221-4/+4
|\ | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
| * qbs build: Set minimum macOS deployment target unconditionallyChristian Kandeler2018-01-181-4/+4
| | | | | | | | | | | | | | | | | | | | The previous construct left the value undefined for Qt < 5.7. Task-number: QTCREATORBUG-19602 Change-Id: I6e6e5b0d3fb4ec76593c50bb13bad49f83b50dcc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | qbs build: Fix minimum Windows versionChristian Kandeler2018-01-191-1/+1
| | | | | | | | | | | | | | | | It's Windows 7, not XP. Change-Id: I0f058fae0e4af10ddca20967eb51594099ba8569 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | qbs build: Suppress some warningsChristian Kandeler2018-01-191-0/+4
| | | | | | | | | | | | | | Like in the qmake build. Change-Id: I7dc4a42bf3e4394a4fb6a579646d806f80fa3e96 Reviewed-by: David Schulz <david.schulz@qt.io>
* | qbs build: Install debug info alongside binariesChristian Kandeler2018-01-124-5/+7
| | | | | | | | | | | | | | | | ... if separate debug info is enabled. Change-Id: I15a02b11e7df18719074b9bc503fe2c207f8bf00 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | qbs build: Use the proper way to check the Qt versionChristian Kandeler2017-11-302-5/+1
|/ | | | | | | | | | | | | Doing this via the product condition silently switches the product off if Qt is too old, which will leave users wondering about the reason. Instead, use the long-supported version check functionality of the Depends item, which will result in a clear message in case of a failure. Also, move the check to QtcProduct. The version requirement is for all of QtCreator, not just the plugins. Change-Id: Id445823e0243f5ad3b7a0ccb747a90e4fb18889b Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Suppress noexcept-type warnings also in qbs buildOrgad Shaneh2017-10-301-0/+4
| | | | | | | This amends commit 68589a3fbc9afe4485baf728729c969e0f508385. Change-Id: Idf0e296f7549e8aea7109e0c877e27032b99e9b8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbs build: Add missing definesChristian Kandeler2017-10-181-1/+5
| | | | | | | | The string concatenation macros were not set, as opposed to the qmake build. Change-Id: I32e2c72c891419ef8352cb7b46e3b7f9b82b6312 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Bump minimum Qt version to 5.6.2Eike Ziller2017-08-291-1/+1
| | | | | | | | Starting to use macos qmake scope. 5.6.3 should be around soon so we can still regression test latest two patch levels. Change-Id: I14f67a26e26c50f6dd0fb8b621f13780b0b05f76 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.3' into 4.4Eike Ziller2017-07-101-0/+2
|\ | | | | | | | | | | | | Conflicts: qtcreator.qbs Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
| * Qbs: fix bundle installation with Qbs 1.8Jake Petroules2017-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | This patch also sets the minimumQbsVersion to 1.7 because that's the version that is actually documented as being required in the README. Change-Id: I862daaf5fa34ab2cc5db47581689e08aa34f0910 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Explicitly specify the minimum macOS version in the qtcjson libraryJake Petroules2017-06-231-1/+1
|/ | | | | | | | Also don't set the value in more than one place. Change-Id: Iea1dc1d4e127c12d6333799dda91749eb2d604d4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix deployment target on macOSJake Petroules2017-06-122-2/+6
| | | | | | | | According to the README, the minimum version is 10.8, but the code did not reflect that reality. Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.2' into 4.3Eike Ziller2017-03-091-1/+0
|\ | | | | | | | | | | | | | | Conflicts: doc/src/qtcreator.qdoc tests/system/suite_general/suite.conf Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
| * Doc: Remove unused QTC_LICENSE_TYPE defineEike Ziller2017-03-061-1/+0
| | | | | | | | | | Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Move mimetype definitions to plugin specsEike Ziller2017-02-271-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Avoids the hassle of QRC files and manually registering mime types - Avoids performance regressions because of mime types that are registered after mime database has been used - Makes it technically possible to detect that a disabled plugin could handle a mime type if it was enabled Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Bump C++ version to 14Marco Bubke2017-01-051-1/+1
|/ | | | | | | | | | | | | | Our compilers support some features which are part of the C++ 14 feature set. Some off them are silently compiled with the C++ 11 setting. For example: [foo=bar] {} is actually working with GCC but is part of C++ 14. Change-Id: Icf2c3806e26c675f8251768c6ad54ba4da186d11 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Don't use relative paths in product parent itemsChristian Kandeler2016-11-232-0/+4
| | | | | | | | We should be explicit about where we assume the source files to be. The base directory might change in the future. Change-Id: Ifd53c2586f5c67a72ed928130647083d467a3e30 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qbs build: Fix the names of some Qt modules in Depends itemsChristian Kandeler2016-11-103-3/+3
| | | | | | | | It's "testlib", not "test". And "designercomponents" is actually a private module. Change-Id: I1a14d107bb5568b4f3807558ec6ed11937ac816a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-08-052-7/+4
|\ | | | | | | Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
| * qbs build: Fix warnings on WindowsChristian Kandeler2016-08-051-1/+4
| | | | | | | | | | Change-Id: Ic62200d30be054128fd810ae85e7b8eb1900be89 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * qbs build: Remove "-s" from linker flagsChristian Kandeler2016-08-011-6/+0
| | | | | | | | | | | | | | | | It is unclear why this was added, the qmake build does not have it either, and it breaks linking on some versions of macOS. Change-Id: I878273e072808416a12cf5c973f2ceacde549f74 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-07-296-10/+10
|\| | | | | | | Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
| * Fix qbs build on macOSChristian Kandeler2016-07-286-10/+10
| | | | | | | | | | | | | | "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/4.1'Eike Ziller2016-07-111-1/+1
|\| | | | | | | | | | | | | | | Conflicts: README.md src/plugins/modeleditor/actionhandler.cpp Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
| * qbs build: Remove version part from plugin file namesChristian Kandeler2016-07-051-1/+1
| | | | | | | | | | | | | | | | The files now have the same names as in the qmake build (e.g. libCore.so rather than libCore.so.4.0.82). Change-Id: I426a8b3ff55525cc9b066bfa4288d993fe3c1b6e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Update requirements for building Qt CreatorEike Ziller2016-07-061-1/+1
|/ | | | | | | | Change-Id: I462c496a6998862d1f1d09fc323342429115b67b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Ralf Nolden <nolden@kde.org>
* qbs build: Use precompiled headers.Christian Kandeler2016-06-235-0/+25
| | | | | | | | It was an oversight that we haven't done this before. Change-Id: Ic338503f6c1ca5e6c52c9af3bdbdb92b7776cac1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* qbs build: Introduce libclang module.Christian Kandeler2016-06-172-78/+0
| | | | | | | | | This is The Right Way to detect libclang. Using a Probe will also slightly improve performance in qbs 1.6 due to the result caching. Change-Id: I063a8d108d02b620dda2df75dd8c014c84f27ec7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* qbs build: Final steps to support building plugins "out of source".Christian Kandeler2016-06-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | - Use the entire Export block when creating a module, not just the Depends items. Adapt references to the product source directory and the "share" directory so that they point to the respective locations in the install tree. - Install dev headers for some more plugins. - Bug fixes & polishing. Create a "dev installation" like this: $ qbs qtc.make_dev_package:true qbs.installRoot:<install root> Then build your plugin against it like this: $ qbs qtc.make_dev_package:true qbs.installRoot:<install root> project.qbsSearchPaths:<install root>/qbs-resources (Using qbs from 1.5 branch; 1.5.1 requires a trivial wrapper project.) That's all. Successfully tested with all commercial plugins on Linux. Change-Id: Ie39c4717dafcd431c533421a15f2f898783d8521 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Change installNamePrefix to sonamePrefix in accordance with Qbs 1.5.Jake Petroules2016-06-132-2/+6
| | | | | | | Task-number: QTCREATORBUG-16428 Change-Id: I219a388460ba359aec76671ba1a3b01ac4509372 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* qbs build: More steps toward creating a "development installation".Christian Kandeler2016-06-135-3/+35
| | | | | | | | | | | | | | | 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>
* qbs build: Introduce new module "qtc".Christian Kandeler2016-06-086-23/+26
| | | | | | | | | The qtc module gathers properties that used to live in the top-level project file. This is the first step towards making it possible to build plugins against an installed Qt Creator ("out of source build"). Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: Remove some differences to qmake build results.Christian Kandeler2016-05-173-2/+4
| | | | | | | | | | | - Install library symlinks. - Do not create symlinks for plugins. - Skip some translations. - Rename some binaries. - Do not install the ptracepreload library. Change-Id: I0faa98034154e3840cd2695cab14b72c34cfc5c3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Set the right version number on our binaries.Christian Kandeler2016-05-133-0/+5
| | | | | | | | | | While we have not encountered issues so far with using the default values, it seems more correct to set the version so that e.g. on Unix a library's soname contains the actual Qt Creator major version etc. For good measure, also set the compatibility version on OS X. Change-Id: I956c473e0b440fc87ffe1aaf99af626da733b5fb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Build documentation also when using qbs.Christian Kandeler2016-04-271-0/+33
| | | | | Change-Id: I17330fa27effc633a06bc8f0a5864e771b831476 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/4.0'Oswald Buddenhagen2016-03-221-1/+1
|\
| * Bump required Qt version to 5.5hjk2016-03-211-1/+1
| | | | | | | | | | | | Change-Id: I4f152bde842c20b0dade863ffea118fe32322c5b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Fix autotests build.Christian Kandeler2016-03-221-1/+1
| | | | | | | | | | Change-Id: I5b0ea5df0a7321c6938146a5a03b089c837ff642 Reviewed-by: hjk <hjk@theqtcompany.com>
* | Fix project resolving with qbs master.Christian Kandeler2016-03-221-2/+3
|/ | | | | Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Adapt to new implementation of qbs.FileInfo.Christian Kandeler2016-03-021-4/+4
| | | | | | | | | | We cannot pass in a relative path as the first argument of FileInfo.relativePath() anymore, which we relied on in some places. The old implementation assumed that if both arguments were relative paths, they had an implicit common base directory. Change-Id: I55ee62e478da761cf085587c57220d5fb1ac990e Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 09:15:09 +0000