summaryrefslogtreecommitdiff
path: root/qtcreator.pro
Commit message (Collapse)AuthorAgeFilesLines
* Temporarily (?) remove make dependencies on deployqt targetEike Ziller2014-10-281-3/+3
| | | | | | | | | 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>
* OS X: make code signing deep, which is needed since recent policy changesEike Ziller2014-10-201-1/+1
| | | | | Change-Id: Ib1de4ed310dc85328ecf18b9268631ffdb6dd5eb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-151-1/+1
| | | | | | | it's the correct variable to use. Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-021-1/+1
| | | | | | | | 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>
* Fix library and plugin pathsEike Ziller2014-09-021-4/+4
| | | | | | | | | 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>
* Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri filesEike Ziller2014-08-261-3/+3
| | | | | Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix RPATH for qbs application.Christian Kandeler2014-08-081-1/+1
| | | | | | | | | 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>
* don't add qbs-related flags to CONFIG over and over againOswald Buddenhagen2014-08-081-2/+4
| | | | | Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Update qbs submodule.Christian Kandeler2014-07-231-1/+1
| | | | | | | And do the necessary adaptations. Change-Id: I35b5c3e02a7265bdc9730154d6d1aa6b19371310 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qbs: Use cache(...) instead of echoing system calls to write .qmake.cacheEike Ziller2014-07-111-27/+30
| | | | | | | | 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>
* Move call of qmake function relative_path() out of .qmake.cache.Christian Kandeler2014-06-271-6/+11
| | | | | | | Apparently, function calls are not allowed there. Change-Id: Iba5c093ec473eb89df4d046a218df6ec78d14c7c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix default search and plugin path for qbs.Christian Kandeler2014-06-241-0/+2
| | | | | | | | 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>
* Qbs: fix QBS_APPS_DESTDIR with spacesJoerg Bornemann2014-05-191-1/+1
| | | | | | Change-Id: I23f2a51aef58143dd530a50c7df43bfb7bb573a8 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Do not use OS scopes in .qmake.cache.Christian Kandeler2014-04-301-2/+2
| | | | | | | 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>
* When the qbs submodule is present, build its applications too.Christian Kandeler2014-04-291-0/+4
| | | | | | | | | | | | | 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>
* fix location of qbs plugins on OS XJoerg Bornemann2014-03-281-1/+5
| | | | | | Task-number: QTCREATORBUG-11866 Change-Id: I261fdabd100c6f6827d4195624d56343cd59fb81 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Support configurable library location in qbs build.Christian Kandeler2014-02-281-2/+3
| | | | | | | | | 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>
* Fix location of qbs plugins.Christian Kandeler2014-02-271-0/+2
| | | | | | | | They are not (arch-independent) resources. Task-number: QTCREATORBUG-10074 Change-Id: If257dfc3a8a866003c84331409162699b162eb19 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 'make deployqt' fixed when non system Qt are used for QTC buildFrantisek Vacek2013-10-271-1/+1
| | | | | | Change-Id: I2904abcc540b4c9058bd8ba51b281e09b8b208e7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Fix size of disk image in the hope of avoiding resize problemEike Ziller2013-10-091-1/+1
| | | | | | | diskimages-helper: resize request is above maximum size allowed. Change-Id: I6cc8da465d99fdb971d5e66090163464c85ccec1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make the pattern used for installers overridableEike Ziller2013-10-071-6/+7
| | | | | Change-Id: If34cd0edcf50884ffaee8879628acaa019a432ac Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove remaining usages of Qt Quick 1 / DeclarativeEike Ziller2013-10-021-1/+1
| | | | | | | | | | | | | | | 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>
* adding python to *.py package callsTim Jenssen2013-09-041-2/+2
| | | | | | | | | | | | - 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>
* Checkout correct branch of the binary-artifacts repository.David Schulz2013-06-261-1/+1
| | | | | | Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Installer/Mac: don't add fancy stuff into the installer app name.Eike Ziller2013-06-201-1/+2
| | | | | | | | 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>
* Add some OTHER_FILESEike Ziller2013-06-201-2/+10
| | | | | Change-Id: I0f6b90c762029797c708fcdbadc5e19153a4471d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Make it possible to build Qt Creator installers on Mac tooEike Ziller2013-06-191-1/+14
| | | | | Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Inform Qt 5 about the .qmake.cache that we're generatingTor Arne Vestbø2013-05-081-0/+2
| | | | | Change-Id: I2708b8382125302c07f4cce7ef8dcb8af989c78e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Mac: Deploy and patch qml imports and qml2puppetEike Ziller2013-04-301-1/+1
| | | | | | | | | | 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>
* Fix potential quoting problem in .qmake.cache on Windows.Christian Kandeler2013-04-031-1/+1
| | | | | | | | | 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>
* Fix qbs submodule installation.Christian Kandeler2013-03-141-0/+5
| | | | | | | | | | | 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>
* Update qbs submodule and make use of the new QBS_DESTDIR variable.Christian Kandeler2013-03-131-2/+7
| | | | | | Change-Id: I3cc3e1f20fdd122f9f493c25d15902e926fe0ad9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Build tests subdirectoryOrgad Shaneh2013-03-121-0/+1
| | | | | | | | | 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>
* QbsProjectManager: Fix Windows build.Christian Kandeler2013-03-061-0/+8
| | | | | | | 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>
* read INSTALLER_ARCHIVE variable from environmentTim Jenssen2013-03-051-3/+8
| | | | | | | | 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>
* Packaging: Use x86 instead of i386 for file names.Eike Ziller2012-12-191-1/+4
| | | | | Change-Id: I56cb84c45e2c9e9410f59a8c8602286242731a19 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix deployment of designer plugins.Eike Ziller2012-12-101-1/+1
| | | | | | | | | Task-number: QTCREATORBUG-8256 Change-Id: I9b03debf9c4c918968fcdfd49078218b54a3b09f Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Mac: Allow specifying additional flags for code signingEike Ziller2012-11-281-1/+1
| | | | | Change-Id: I74d90b34e9a962cb918e5c93558f2ca2dc058f8d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Deploy Qt translations on Mac.Eike Ziller2012-11-281-1/+1
| | | | | | | | Task-number: QTCREATORBUG-8244 Change-Id: I39bd64bb7a3e75b54f3f0b9297a27b460b603cc9 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Rename the (un)installers.Eike Ziller2012-10-161-1/+1
| | | | | | | | Windows has a problem with "install" in the name. Use .bin on Linux like before. Change-Id: I4f887a8c0442cd9f0a17425f68a36a371ae9f6b7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Include qbs files in qmake project treeOrgad Shaneh2012-10-161-1/+3
| | | | | | Change-Id: I864b1b500d385c91e3cac6725202ad7f48f11b17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix command line arguments for installer generation.Eike Ziller2012-09-281-1/+1
| | | | | Change-Id: I5b204936fbfc6073f32769ac0bf2196c26b40483 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add installer target.Eike Ziller2012-09-281-3/+12
| | | | | | | Requires Qt Installer Framwork (IFW) Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Consolidate the bindist make target setupEike Ziller2012-09-271-12/+19
| | | | | | Change-Id: Ic6928f2eab43930dc1920bd774798e899a76cabd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Introduce $$QTC_PREFIXDaniel Molkentin2012-09-251-6/+10
| | | | | | | | | | | | | | | | 'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/... This is used for giving the contents of the 7zips an additional prefix. (previously done by doing an additional copying step in bindistHelper). QTC_PREFIX can also be used to give Qt Creator a different install path at qmake time, and defaults to /usr/local on Linux. On Windows and Mac there is no default for QTC_PREFIX. Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make && INSTALL_ROOT=/tmp/creator-dist make install Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."Eike Ziller2012-09-071-17/+6
| | | | | | | | | | It depends on and mixes in changes made in another change on gerrit that is not merged, so it breaks the package build. This reverts commit c29bf6f6525d435d69936576761b4a29102cd056. Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).Daniel Molkentin2012-09-051-6/+17
| | | | | | | | | | | | | | | | | Reason: $INSTALL_ROOT is only meant to be used by packagers to temporarily put the contents into a different location, which is needed for fakeroot packaging. QTC_PREFIX is not a qmake variable, and defaults to /usr/local. On Windows the default prefix is "QtCreator", since "make install" is expected to be used in a packaging context only where either INSTALL_ROOT should be used or QTC_PREFIX should be set to the absolute destination path where e.g. an installer generator will pick it up. Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Mac: Add make target for code signing.Eike Ziller2012-09-031-1/+2
| | | | | | | | Use like this: SIGNING_IDENTITY="My ID" make codesign Change-Id: Id71547a7e5926c34b6dad22017b5005791419cf0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* bump qt dependency to 4.8Oswald Buddenhagen2012-08-291-2/+2
| | | | | | Change-Id: I5aa424bacf9f66761d335f5b53734453ee864b80 Reviewed-by: Robert Loehning <robert.loehning@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Win: Don't require interaction with "make deployartifacts"Eike Ziller2012-08-281-1/+1
| | | | | Change-Id: Ieacef53be501fdddc16c10e9facbb3937cbd37b4 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
View Lorry Controller Status