summaryrefslogtreecommitdiff
path: root/qtcreator.pro
Commit message (Collapse)AuthorAgeFilesLines
* Update changes file.Eike Ziller2012-01-241-1/+2
| | | | | Change-Id: I83d9313f56b8ef161d73ba263abf2711d6397486 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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