Commit Graph

110 Commits

Author SHA1 Message Date
Christian Kandeler
1f73fb1402 qbs build: Update minimum qbs version
Change-Id: I1af5c32f4e19f67013a53fc3da7c1bcafbd4864b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-04 13:40:24 +00:00
Eike Ziller
345ea0307c Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
	qtcreator.qbs

Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
2017-07-10 09:54:52 +02:00
Jake Petroules
b80d5c1c95 Qbs: fix bundle installation with Qbs 1.8
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>
2017-07-07 17:28:33 +00:00
Jake Petroules
7ff48935e8 Explicitly specify the minimum macOS version in the qtcjson library
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>
2017-06-23 17:28:58 +00:00
Eike Ziller
461a7483e3 Doc: Remove unused QTC_LICENSE_TYPE define
Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-03-06 07:46:13 +00:00
Christian Kandeler
4a829b9279 Bump minimum qbs version
Gets rid of warnings.

Change-Id: Icdb86ad8d99322f4a5091f5fd8cf80fb5fb5a066
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-30 07:22:50 +00:00
Christian Kandeler
bb02a0900f List qmake project files in qbs project
Change-Id: Ib0c68398ce80e1de2ee6a2e4385ffd38baec0bd2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-22 08:26:06 +00:00
Christian Kandeler
f4c7a3b887 qbs build: Fix autotest runner
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>
2016-07-05 11:23:41 +00:00
Tim Jenssen
943cb2b378 qbs: fix build on windows
Change-Id: I851abd4e19c5da16bcca6efeead7fe38e5b75c6e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-22 07:50:47 +00:00
Christian Kandeler
f085cb2236 qbs build: More steps toward creating a "development installation".
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>
2016-06-13 08:36:26 +00:00
Christian Kandeler
a0f956f050 qbs build: Introduce new module "qtc".
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>
2016-06-08 08:46:00 +00:00
Christian Kandeler
4d5a8368a7 Build documentation also when using qbs.
Change-Id: I17330fa27effc633a06bc8f0a5864e771b831476
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-04-27 07:05:19 +00:00
Christian Kandeler
6033231ae9 Bump minimum qbs version.
Change-Id: I9c1a3f064054b1cedd153f2d9e535e3c31619847
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-23 13:56:24 +00:00
Christian Kandeler
0bbd8a85d3 Fix project resolving with qbs master.
Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-22 14:00:51 +00:00
hjk
82a523f6b1 Relax use of QT_NO_CAST_FROM_ASCII to QT_RESTRICTED_CAST_FROM_ASCII
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>
2016-03-17 16:01:33 +00:00
Eike Ziller
ca6fa32606 Version bump
Change-Id: If3aaffb25f71082194e21c4ce00119957a33d363
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-08 11:52:10 +00:00
Christian Kandeler
a081e8c96f qbs build: Fix autotest runner on Windows.
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>
2016-01-25 09:39:52 +00:00
Eike Ziller
e492d63aa3 Version bump
Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-15 10:57:45 +00:00
Eike Ziller
9554495bb1 Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/baremetal/gdbserverproviderprocess.cpp

Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
2015-12-07 15:55:35 +01:00
Eike Ziller
fb1e9bc785 Version bump
Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-04 08:58:32 +00:00
Eike Ziller
310ae09996 Merge remote-tracking branch 'origin/3.6'
Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
2015-10-30 16:08:03 +01:00
Eike Ziller
411c79a599 Version bump and use binary artifacts 3.6
Change-Id: I57f643b0400c945f2bfe3513ef23a9eccc083100
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-30 08:44:36 +00:00
Jake Petroules
59ac67c0bb Qbs: properly install Info.plist, PkgInfo, and app icon.
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>
2015-10-21 16:18:51 +00:00
Eike Ziller
cd5f9f6ff8 Merge remote-tracking branch 'origin/3.5'
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
2015-08-04 13:16:03 +02:00
Christian Kandeler
b67a8e31dd qbs build: Remove outdated property.
Change-Id: I67e995793d1a818e6b0f2536c2410925f2edffa6
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-07-18 06:42:59 +00:00
Eike Ziller
26eca3d15a Version bump
Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-10 12:23:48 +00:00
Eike Ziller
d6da70916d Merge remote-tracking branch 'origin/3.5' 2015-07-10 14:08:29 +02:00
Eike Ziller
387e4917a6 Version bump
Change-Id: I9f8d177d34cc277fdea51da5224fbc4c7ee8a589
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 13:50:05 +00:00
Christian Kandeler
6d5a5aff94 Use a proper libexec path for Unix builds.
Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 09:08:01 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
2015-06-17 12:04:21 +02:00
Eike Ziller
52d89196bc Version bump
Change-Id: I4a9cde2300b1cc14feadaa6240fefebc57fd0e19
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-16 08:51:45 +00:00
Christian Kandeler
8eb7c3efad Adapt to qbs' libexec infrastructure.
Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-06-03 15:29:55 +00:00
Eike Ziller
e2705d4ecb Version bump
Change-Id: Icba0aa76b9db40c46c026177637c5ea92593c4c0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-15 07:30:03 +00:00
Eike Ziller
841046aeda Version bump
Change-Id: Ie12f7ab510b6d9857772df9f36c99e72b8766520
2015-04-01 11:24:41 +02:00
Eike Ziller
f4a3b4ca5f Merge remote-tracking branch 'origin/3.4'
Change-Id: Ib5ce531102eeef86a34ee78e6990791cf4c910c4
2015-02-18 16:35:46 +01:00
Christian Kandeler
05f8a2c813 qbs build: Introduce convenience project property sharedSourcesDir.
Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-18 14:49:06 +00:00
Eike Ziller
0763f44504 Bump version
Change-Id: I5ae9ff3bbda235781b490889be292af7812e720e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-18 08:23:37 +00:00
Christian Kandeler
cdc6d45a8a qbs build: Add the possibility to include additional autotests.
For plugins that don't live in the main repo.

Change-Id: Iebe4b05bfb60f86531ec82a4ae555fdfaac39ead
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-26 12:38:10 +01:00
Christian Kandeler
1199a93fc0 qbs build: Make use of AutotestRunner.
And fix some autotest project file problems uncovered by this.

Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-12-19 15:10:36 +01:00
Robert Loehning
06a47dd56c Version bump
Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-28 16:55:15 +01:00
Eike Ziller
3335e8a475 Version bump
Change-Id: If2233d241e83f82400e4e910e405eabebf887d58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 11:28:57 +01:00
Eike Ziller
deea0022f7 Fix library and plugin paths
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>
2014-09-02 09:24:10 +02:00
Christian Kandeler
1d5091e48f Do not use deprecated Qt functionality.
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>
2014-08-29 14:10:41 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
2014-08-05 14:24:23 +02:00
Christian Kandeler
3c6b2691b7 Set the minimum qbs version on the project.
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>
2014-07-31 14:54:40 +02:00
Eike Ziller
a2c18fc6ec Version bump
Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-24 16:35:33 +02:00
Eike Ziller
f42358a16e Fix version number.
Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-22 16:35:17 +02:00
Eike Ziller
69fe69f6ba Version bump
Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-08 13:23:32 +02:00
Eike Ziller
e5504be861 Version bump
Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-07 16:54:53 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
2014-05-02 10:00:20 +02:00