summaryrefslogtreecommitdiff
path: root/qtcreator.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* fix shadow build detectionOswald Buddenhagen2009-05-061-1/+2
|
* simplify version checkOswald Buddenhagen2009-05-061-3/+2
|
* revamp the build system regarding translationsOswald Buddenhagen2009-04-201-8/+0
|
* revamp build systemOswald Buddenhagen2009-04-201-1/+2
| | | | | | | | | now bin and share are not pegged to linking the executable any more, but are proper subdirs targets of their own. unforturnately, qmake is a bit tenacious, so we hack around a bit. :) more or less in passing by, i removed some superfluous trailing slashes and added path normalization as well.
* add ts and qm build targetsOswald Buddenhagen2009-02-271-0/+8
| | | | | this is based on patches from axasia, which are in turn an almost literal copy from qt.
* Fixes: - Resources (templates etc) on Maccon2009-01-271-1/+0
|
* Fixes: make install works on linuxDaniel Molkentin2009-01-211-2/+0
| | | | | | Details: Creator on Linux works now in two modes: 1) out of the build dir (shadow builds to be tested) 2) make INSTALL_ROOT=/prefix install
* Fixes: make install workdDaniel Molkentin2009-01-211-17/+3
| | | | | | | | Details: Make install works now, we just have to agree on layout details and check for mac compatibility. Also, plugins will carry no version in their filename anymore starting with this commit. Versioning happens in the creators pluginloader using the pluginspec file.
* More work toward make install on Linux.Daniel Molkentin2009-01-211-0/+16
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainlinedt2009-01-081-0/+2
|\
| * Fixes: - Mac build (docs) and toplevel "make docs" targetcon2009-01-071-0/+2
| | | | | | | | RevBy: - bjørn
* | Fixes: Move qt version check to qtcreator.prodt2008-12-181-0/+8
|/ | | | RevBy: con
* Initial importcon2008-12-021-0/+4
View Lorry Controller Status