summaryrefslogtreecommitdiff
path: root/qtcreator.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fixes for bindist target.Daniel Molkentin2012-01-301-2/+2
| | | | | Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Add deployartifacts commandDaniel Molkentin2012-01-301-4/+9
| | | | | | | | | | | Deploys prebuilt artifacts from remote repository. Currently only used on Windows, includes the 64 bit debugging helper and a stable version of jom, taken from an external repository. Change-Id: I9f034f184f94bf4e0b088338cde6d8e0d6c7d419 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Mac/deployqt: Give qmlpuppet the correct qt.confEike Ziller2012-01-241-6/+3
| | | | | Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Add platform names and versionsDaniel Molkentin2012-01-181-3/+6
| | | | | | | | Also introduce $INSTALL_EDITION env var which acts as infix. (possible values: opensource, commercial, etc) Change-Id: I86f58444b21853ae4bcb8509e491610c76c414da Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Add make dmg targetDaniel Molkentin2012-01-171-0/+2
| | | | | Change-Id: I643d571afbb7b16f860092c885e3574268f91ddf Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Add bindist and deployqt targetsDaniel Molkentin2012-01-121-0/+18
| | | | | Change-Id: Ide9a41d34e73e99959fca18053e06978f724b5aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Include dist/changes-* in OTHER_FILESOrgad Shaneh2011-12-121-13/+1
| | | | | Change-Id: Ib71ba41407309bcea82fecc668bb965eed42f3c7 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-09-151-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.pro share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp src/plugins/remotelinux/remotelinuxruncontrol.cpp Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
| * List new changes-2.3.1 file in qtcreator.proKai Koehne2011-09-071-1/+2
| | | | | | | | | | | | Change-Id: I611935b4c993d70a566fe1cbc6bcf5eb362339c2 Reviewed-on: http://codereview.qt.nokia.com/4349 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Add changes-2.4.0 fileKai Koehne2011-09-131-1/+2
|/ | | | | | Change-Id: Ic6b59e9a40134b1e37e64170bcf12388c535014a Reviewed-on: http://codereview.qt-project.org/4794 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* re-add LD_LIBRARY_PATH scriptOswald Buddenhagen2011-08-181-0/+1
| | | | | | | | | | | | | | | | | | we need to override RUNPATHs from possible plugins. due to d7d23226, this should not re-introduce QTCREATORBUG-1646. unlike in the previous incarnation, we don't replace the binary with the script, but give the script an extension. this is nicer for packagers and less confusing in creator's own run configurations. the .desktop files created by our installers need to be adjusted for that. Task-number: QTCREATORBUG-5565 Change-Id: Icd2fa55456754a05257376b8288e8bdf423c62db Reviewed-on: http://codereview.qt.nokia.com/3180 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Make Components installable. Fix Shadow Build.Daniel Molkentin2011-08-031-1/+1
| | | | | | | | | | Task-Number: QTCREATORBUG-5672 Done-with: Oswald Buddenhagen Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004 Reviewed-on: http://codereview.qt.nokia.com/2451 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Update Qt requirement.Eike Ziller2011-07-141-3/+4
| | | | | | | Change-Id: I8d3eb57a3cb41c4bfd01defc3f5c512a46a7a428 Reviewed-on: http://codereview.qt.nokia.com/1652 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Add dist files to OTHER_FILESEike Ziller2011-07-061-0/+13
| | | | | | | Change-Id: I32f525a2478d4442041c52f22f972202ca61f0b8 Reviewed-on: http://codereview.qt.nokia.com/1231 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Remove tests from the root project to clean up tree/targets in creator.Bill King2010-07-191-1/+0
|
* Fix unintended change.ck2010-07-071-7/+0
|
* Maemo: Correctly deploy subdirs projects.ck2010-07-071-0/+7
| | | | | Task-number: QTCREATORBUG-1614, QTCREATORBUG-1810 Reviewed-by: kh1
* Fix autotests so that they're compiling again.Bill King2010-07-061-0/+1
|
* Remove LD_LIBRARY_PATH script.dt2010-06-221-1/+0
| | | | | | | | Christian Kamm convinced me that it should not have any effect. Reviewed-By: ckamm Task-Nr: QTCREATORBUG-1646
* escape backslashes (or don't use them at all, resp.)Oswald Buddenhagen2010-05-261-1/+1
|
* Increased needed Qt version to 4.7Robert Loehning2010-03-021-2/+2
| | | | Reviewed-by: con
* Fixed printing of the current Qt version numberThorbjørn Lindeijer2009-11-161-1/+1
| | | | | The final dot was confusing qmake, apparently considered part of the variable name.
* Check for Qt 4.6 when building Qt Creatorcon2009-09-021-2/+2
|
View Lorry Controller Status