aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.qbs
Commit message (Collapse)AuthorAgeFilesLines
* qbs build: Update minimum qbs versionChristian Kandeler2017-10-041-1/+1
| | | | | Change-Id: I1af5c32f4e19f67013a53fc3da7c1bcafbd4864b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/4.3' into 4.4Eike Ziller2017-07-101-1/+1
|\ | | | | | | | | | | | | Conflicts: qtcreator.qbs Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
| * Qbs: fix bundle installation with Qbs 1.8Jake Petroules2017-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | 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-0/+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>
* Doc: Remove unused QTC_LICENSE_TYPE defineEike Ziller2017-03-061-1/+0
| | | | | Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump minimum qbs versionChristian Kandeler2016-08-301-1/+1
| | | | | | | Gets rid of warnings. Change-Id: Icdb86ad8d99322f4a5091f5fd8cf80fb5fb5a066 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* List qmake project files in qbs projectChristian Kandeler2016-08-221-0/+13
| | | | | | Change-Id: Ib0c68398ce80e1de2ee6a2e4385ffd38baec0bd2 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Fix autotest runnerChristian Kandeler2016-07-051-2/+1
| | | | | | | | Contained a syntactic and a semantic mistake. No problems were observed, because the two canceled each other out. Change-Id: I75232daa3fa2df2db338a00f561d6f54027bffed Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs: fix build on windowsTim Jenssen2016-06-221-4/+2
| | | | | Change-Id: I851abd4e19c5da16bcca6efeead7fe38e5b75c6e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* qbs build: More steps toward creating a "development installation".Christian Kandeler2016-06-131-0/+12
| | | | | | | | | | | | | | | 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-081-50/+5
| | | | | | | | | 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>
* Build documentation also when using qbs.Christian Kandeler2016-04-271-0/+2
| | | | | Change-Id: I17330fa27effc633a06bc8f0a5864e771b831476 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Bump minimum qbs version.Christian Kandeler2016-03-231-1/+1
| | | | | Change-Id: I9c1a3f064054b1cedd153f2d9e535e3c31619847 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Fix project resolving with qbs master.Christian Kandeler2016-03-221-1/+2
| | | | | Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Relax use of QT_NO_CAST_FROM_ASCII to QT_RESTRICTED_CAST_FROM_ASCIIhjk2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This is an opt-in trade-off between type safety and user code convenience. QT_NO_CAST_FROM_ASCII is highly beneficial to avoid unintended conversions from 8 bit data with potentially "unsuitable" encodings to QString. However, it has the undesirable side-effect to require user code to wrap character and string literals in QLatin1Char(...) and QLatin1String(...) or use similar construction, cluttering the code significantly. QT_RESTRICTED_CAST_FROM_ASCII macro works almost as QT_NO_CAST_FROM_ASCII, except that it enables the QChar(char) constructor and adds an additional QString(const char (&ch)[N]) constructor that matches C++ string literals, but no arbitrary character pointers. This avoids a significant share of the need to clutter the user code by only a slight relaxation of the type-safety. Change-Id: I64e0430bb1352edcedf7e19ee25c16408727084c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2016-03-081-4/+4
| | | | | Change-Id: If3aaffb25f71082194e21c4ce00119957a33d363 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Fix autotest runner on Windows.Christian Kandeler2016-01-251-1/+29
| | | | | | | | The tests need to find Creator's libraries and plugins at run-time. Change-Id: Ided40e70693650a0099661dd961223c5b68da646 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Version bumpEike Ziller2015-12-151-2/+2
| | | | | Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-12-071-4/+4
|\ | | | | | | | | | | | | Conflicts: src/plugins/baremetal/gdbserverproviderprocess.cpp Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
| * Version bumpEike Ziller2015-12-041-4/+4
| | | | | | | | | | Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-10-301-2/+2
|\| | | | | | | Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
| * Version bump and use binary artifacts 3.6Eike Ziller2015-10-301-2/+2
| | | | | | | | | | Change-Id: I57f643b0400c945f2bfe3513ef23a9eccc083100 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Qbs: properly install Info.plist, PkgInfo, and app icon.Jake Petroules2015-10-211-1/+1
|/ | | | | | | | | The icns files have also been moved into an asset catalog because "source code" as a rule should be stored in the preferred form of modification. Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-041-1/+0
|\ | | | | | | Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
| * qbs build: Remove outdated property.Christian Kandeler2015-07-181-1/+0
| | | | | | | | | | Change-Id: I67e995793d1a818e6b0f2536c2410925f2edffa6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Version bumpEike Ziller2015-07-101-4/+4
| | | | | | | | | | Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-07-101-2/+2
|\|
| * Version bumpEike Ziller2015-07-091-2/+2
| | | | | | | | | | Change-Id: I9f8d177d34cc277fdea51da5224fbc4c7ee8a589 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Use a proper libexec path for Unix builds.Christian Kandeler2015-07-091-2/+3
|/ | | | | | Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-06-171-0/+2
|\ | | | | | | Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
| * Version bumpEike Ziller2015-06-161-1/+1
| | | | | | | | | | Change-Id: I4a9cde2300b1cc14feadaa6240fefebc57fd0e19 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Adapt to qbs' libexec infrastructure.Christian Kandeler2015-06-031-0/+2
| | | | | | | | | | Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Version bumpEike Ziller2015-05-151-1/+1
| | | | | | | | | | Change-Id: Icba0aa76b9db40c46c026177637c5ea92593c4c0 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Version bumpEike Ziller2015-04-011-4/+4
| | | | | | | | Change-Id: Ie12f7ab510b6d9857772df9f36c99e72b8766520
* | Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-02-181-0/+1
|\| | | | | | | Change-Id: Ib5ce531102eeef86a34ee78e6990791cf4c910c4
| * qbs build: Introduce convenience project property sharedSourcesDir.Christian Kandeler2015-02-181-0/+1
| | | | | | | | | | Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Bump versionEike Ziller2015-02-181-2/+2
|/ | | | | Change-Id: I5ae9ff3bbda235781b490889be292af7812e720e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Add the possibility to include additional autotests.Christian Kandeler2015-01-261-0/+1
| | | | | | | For plugins that don't live in the main repo. Change-Id: Iebe4b05bfb60f86531ec82a4ae555fdfaac39ead Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Make use of AutotestRunner.Christian Kandeler2014-12-191-1/+3
| | | | | | | And fix some autotest project file problems uncovered by this. Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Version bumpRobert Loehning2014-11-281-4/+4
| | | | | Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2014-10-281-2/+2
| | | | | Change-Id: If2233d241e83f82400e4e910e405eabebf887d58 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix library and plugin pathsEike Ziller2014-09-021-2/+2
| | | | | | | | | OSX: Move libraries from PlugIns/ to Frameworks/ other: move QmlDesigner plugins to plugins directory Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Do not use deprecated Qt functionality.Christian Kandeler2014-08-291-1/+0
| | | | | | | | | | | | | | | Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/3.2'Oswald Buddenhagen2014-08-051-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/android/androidglobal.h Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
| * Set the minimum qbs version on the project.Christian Kandeler2014-07-311-0/+1
| | | | | | | | | | | | | | | | So people will understand why they can't open the projects with older Creator versions. Change-Id: Ie9291096ba001b0d31a58d834ba23c95a569d20f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bumpEike Ziller2014-07-241-2/+2
| | | | | | | | | | Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Fix version number.Eike Ziller2014-07-221-4/+4
|/ | | | | Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Version bumpEike Ziller2014-07-081-2/+2
| | | | | Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Version bumpv3.2.0-beta1Eike Ziller2014-07-071-2/+2
| | | | | Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-021-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/libs/qmljs/qmljsmodelmanagerinterface.cpp src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 13:13:28 +0000