Commit Graph

101 Commits

Author SHA1 Message Date
Eike Ziller
bc562bbea9 Quickfix for building Qbs documentation
Change-Id: Iad6690ffb1578040739ca0d5bb26ca701454ec7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-10 10:35:50 +00:00
Joerg Bornemann
bc5dbd4d23 Build and install the qbs documentation (qmake build)
Task-number: QTCREATORBUG-13124
Change-Id: Iebc4d0f0b4dee13181c76dfae59bc1f79957f886
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-24 12:26:41 +00:00
Orgad Shaneh
c8c532a0e6 Use shallow clone for binary artifacts
The repo is deleted anyway right after the files are copied.

Change-Id: Iec4ae3ca45e94c95a911f245bded36025d3f799b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 09:14:11 +00:00
Orgad Shaneh
8728fb078e Project: Clone binary artifacts via http
git port is sometimes blocked by firewalls.

Change-Id: I8e53b119ec3401532a9da578b64d112250962f46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 08:09:54 +00:00
Aleix Pol
0c20e582e4 [Linux integration] Install desktop and appstream files
Installs the appstream's appdata file into the correct location and with
the correct name. Fixes the contents to conform to the standard.
Installs a desktop file because it's both required by appstream and by
desktop environments. Note this was currently patched in by
distributions.

Task-number: QTCREATORBUG-17335
Change-Id: If1425ec9fbd0c639550852a8d6e1f15a6b9d77ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 13:31:43 +00:00
Eike Ziller
f4f447c078 Ship qtdiag in binary packages
Task-number: QTCREATORBUG-16135
Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-15 09:24:36 +00:00
Eike Ziller
7812390b0b Update requirements for building Qt Creator
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>
2016-07-06 08:11:51 +00:00
Eike Ziller
475e527cf0 Add readme to distfiles
Change-Id: I8dba77fe0d746b044975ca00e372575fe232480b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-23 14:35:13 +00:00
hjk
2baa1f8b77 Bump required Qt version to 5.5
Change-Id: I4f152bde842c20b0dade863ffea118fe32322c5b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-21 13:44:13 +00:00
Eike Ziller
9dd84323df Use variables for install locations
Define variables in qtcreator.pri for the various
install locations, instead of hardcoding the paths
everywhere where they are needed.

Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-09-22 12:16:08 +00:00
Eike Ziller
7743664957 Installers/OS X: Remove hack that is no longer necessary
There were a few Qt versions where the menu nib was missing from the
installer, but no longer.

Change-Id: I2ab95237cb5e0d2b72d7086f8a784a35e0c935a1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-30 05:50:04 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
2015-06-17 12:04:21 +02: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
Christian Stenger
9d86b7ed4e Raise minimum Qt version
Needed for supporting more C++11 features.

Change-Id: Ib3ab63b2698c86a1ad0153c3e4bead09cccdefca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-09 07:01:57 +00:00
Eike Ziller
1eeca66c29 Get rid of Gitorious links
That service is discontinued, and we have our own mirror anyhow.

Change-Id: I8a45401e2c0c889d87c675a79ae16684d7c69a7a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-10 13:50:48 +00:00
Eike Ziller
29d20a9f85 Temporarily (?) remove make dependencies on deployqt target
Definitely avoid deploying Qt multiple times, since
this might be a reason for code signature verification on OS X bailing
out, claiming that files have been modified.

Change-Id: Ic45b6fd4af75a3b972aec8c0b4841f0ff4e7886d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 18:00:44 +01:00
Eike Ziller
12201a6304 OS X: make code signing deep, which is needed since recent policy changes
Change-Id: Ib1de4ed310dc85328ecf18b9268631ffdb6dd5eb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-20 14:34:29 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02: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
Eike Ziller
78b642eb0c Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri files
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-26 11:00:57 +02:00
Christian Kandeler
433426847f Fix RPATH for qbs application.
The current random number of backslashes results in an RPATH of
'\RIGIN' in the binary. Use a different random number of backslashes
instead.

Change-Id: Ife0f1a9c7f65d9e83dc39e90cb150421755ebb2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-08 14:40:19 +02:00
Oswald Buddenhagen
3e08d94436 don't add qbs-related flags to CONFIG over and over again
Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-08 13:17:40 +02:00
Christian Kandeler
5a16eaca04 Update qbs submodule.
And do the necessary adaptations.

Change-Id: I35b5c3e02a7265bdc9730154d6d1aa6b19371310
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-23 11:33:54 +02:00
Eike Ziller
e7b07a2b36 Qbs: Use cache(...) instead of echoing system calls to write .qmake.cache
Qbs is nowadays disabled with Qt4 anyhow, so we can use the less
hacky Qt 5 methods

Change-Id: I9ce9391238b3597cc4b31e9f9f6647cec1a2496e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-07-11 11:07:05 +02:00
Christian Kandeler
a02dc5135e Move call of qmake function relative_path() out of .qmake.cache.
Apparently, function calls are not allowed there.

Change-Id: Iba5c093ec473eb89df4d046a218df6ec78d14c7c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-27 12:00:28 +02:00
Christian Kandeler
9b9814fd72 Fix default search and plugin path for qbs.
That is, the qbs command-line frontend that we build.

Task-number: QTCREATORBUG-12474
Change-Id: Ia21c24daa25fff5ffe2fe69d23bd6d30285eec9a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-24 16:39:24 +02:00
Joerg Bornemann
9692c91d0f Qbs: fix QBS_APPS_DESTDIR with spaces
Change-Id: I23f2a51aef58143dd530a50c7df43bfb7bb573a8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-05-19 17:18:21 +02:00
Christian Kandeler
850f46816f Do not use OS scopes in .qmake.cache.
Apparently, that is not allowed in Qt 4 and not recommended in Qt 5.

Change-Id: I4183935d40d1c96c8716562112a31338a2fe57ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-30 17:13:52 +02:00
Christian Kandeler
01302a49df When the qbs submodule is present, build its applications too.
So far, we have only built the library, arguing that that's all
QtC needs from qbs. However, it turns out that it is useful to have
the qbs executable as well, e.g. if there is a problem and the
user wants to quickly compare the behavior of QtC and the
command line tool with the guarantee that they're using the exact
same qbs library.

Task-number: QBS-558
Change-Id: Iddf94a0b304467abee313bcd52e446f02156c98b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-29 17:39:32 +02:00
Joerg Bornemann
de99c7a6ed fix location of qbs plugins on OS X
Task-number: QTCREATORBUG-11866
Change-Id: I261fdabd100c6f6827d4195624d56343cd59fb81
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-03-28 16:27:49 +01:00
Christian Kandeler
c8881e7ca2 Support configurable library location in qbs build.
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.

Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-28 17:38:41 +01:00
Christian Kandeler
8a8092912b Fix location of qbs plugins.
They are not (arch-independent) resources.

Task-number: QTCREATORBUG-10074
Change-Id: If257dfc3a8a866003c84331409162699b162eb19
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-27 12:36:15 +01:00
Frantisek Vacek
4b8a1bc7e0 'make deployqt' fixed when non system Qt are used for QTC build
Change-Id: I2904abcc540b4c9058bd8ba51b281e09b8b208e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-27 09:50:54 +01:00
Eike Ziller
6889547fe1 Mac: Fix size of disk image in the hope of avoiding resize problem
diskimages-helper: resize request is above maximum size allowed.

Change-Id: I6cc8da465d99fdb971d5e66090163464c85ccec1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-09 11:22:48 +02:00
Eike Ziller
1a7f77c6b7 Make the pattern used for installers overridable
Change-Id: If34cd0edcf50884ffaee8879628acaa019a432ac
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-10-07 13:36:32 +02:00
Eike Ziller
0b82b54c24 Remove remaining usages of Qt Quick 1 / Declarative
Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.

Also removes the unused qtcomponents.

qmlpuppet of course still links against declarative, but that's not run
in the same process.

Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-02 11:39:23 +02:00
Tim Jenssen
ff775f6d55 adding python to *.py package calls
- under windows we had the problem that *.py needs to be registered and
    even if we had it: a call with modified PATH variable resulted in
    strange two PATH variables in the environment (not sure that this was
    a problem of nmake or something else)
  - added -u to get the output unbuffered

Change-Id: I9326a31fc39a95b61d92bb00549f536db04af985
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-09-04 11:39:00 +02:00
David Schulz
ee70e9d267 Checkout correct branch of the binary-artifacts repository.
Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-26 16:12:08 +02:00
Eike Ziller
4d5ffd4e91 Installer/Mac: don't add fancy stuff into the installer app name.
The file name pattern that is used for win/lin should only be used for
the resulting disk image, not the installer app itself

Change-Id: Ia0b41fd379faf093af71dc526f32a768552d5e2f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-20 15:32:17 +02:00
Eike Ziller
e380e74605 Add some OTHER_FILES
Change-Id: I0f6b90c762029797c708fcdbadc5e19153a4471d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-20 13:41:46 +02:00
Eike Ziller
4babcabf20 Make it possible to build Qt Creator installers on Mac too
Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-19 18:42:23 +02:00
Tor Arne Vestbø
b5747ebdae Inform Qt 5 about the .qmake.cache that we're generating
Change-Id: I2708b8382125302c07f4cce7ef8dcb8af989c78e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-08 12:39:34 +02:00
Eike Ziller
71f1919de9 Mac: Deploy and patch qml imports and qml2puppet
The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.

Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 09:18:43 +02:00
Christian Kandeler
eb872d3204 Fix potential quoting problem in .qmake.cache on Windows.
Unlike mingw makefiles, system() actually always uses the real
host shell, so use the host OS instead of the makefiles' path
separator as the discriminator.

Change-Id: Iaba6fc76f469e75fadd9d07e0c9e1ac07016338c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-03 14:10:59 +02:00
Christian Kandeler
cea78fccbd Fix qbs submodule installation.
We want the qbs library and resources to be placed in
the canonical places when installing Qt Creator. This
also makes it necessary to change the location of the
respective files in the build directory.

Change-Id: I8e78ec5aa0e8b728ccca96d45a647c1488961ea0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-03-14 08:20:15 +01:00
Christian Kandeler
36e1c03ae6 Update qbs submodule and make use of the new QBS_DESTDIR variable.
Change-Id: I3cc3e1f20fdd122f9f493c25d15902e926fe0ad9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-03-13 09:33:06 +01:00
Orgad Shaneh
513e226dc1 Build tests subdirectory
Requires BUILD_TESTS qmake variable to be set

Change-Id: Ida266ce96ec4725608e1290908c546b32ba681ac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-12 09:41:44 +01:00
Christian Kandeler
169a47fe00 QbsProjectManager: Fix Windows build.
The qbs DLL must end up in bin/ in order to be found by the plugin.

Change-Id: Ie81e7550aa51f3414d829c893ad03dcafcc9c7fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-06 17:06:58 +01:00
Tim Jenssen
8bea8816ba read INSTALLER_ARCHIVE variable from environment
With that we can overwrite the default value which is not
needed in the build package for SDK case.

Change-Id: Ife33317a92149f812aafebf806743f3e322ead1d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-05 10:45:23 +01:00