summaryrefslogtreecommitdiffstats
path: root/qtbase.pro
Commit message (Collapse)AuthorAgeFilesLines
* Ensure qmodule.pri is installed.Rohan McGovern2011-11-231-1/+5
| | | | | | | | | | | | | | | | From the commit message of 0b2ce8520020a0db9b5b5feb5e72f64518d3eea5 and the code in qt_module.prf, it is apparently intended that qmodule.pri is installed, but this was never implemented correctly. Make sure we install it. This has gone unnoticed because it happens to be installed by accident unless $$QT_SOURCE_TREE != $$QT_BUILD_TREE and $$QT_BUILD_TREE != $$[QT_INSTALL_PREFIX] (i.e. a shadow build which is not using -developer-build). Change-Id: Iee861a7bb592ca43a61ad91f1ef6a7a5bd21aff8 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix make confcleanAnders Bakken2011-09-121-4/+4
| | | | | | | | | | | Merge-request: 1227 Reviewed-by: ossi (cherry-picked from commit 792b4b500ab740f89db5586791105ff13778b87f) Change-Id: Id5ec2cfb228691c8483bf1d9e0c6a763aa649217 Reviewed-on: http://codereview.qt-project.org/4570 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Try to make sure the config test script is installed.Michael Goddard2011-07-261-0/+5
| | | | | | | | | | And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove all references to demos.Casper van Donderen2011-06-231-4/+0
| | | | | | | | | | | Remove the references to demos from configure and qtbase.pro. This is done because of the merge of the demos and examples in Qt. Everything will be added as an example. Change-Id: Iec040f5c719384c7aabba971316de40195ed3a69 Reviewed-on: http://codereview.qt.nokia.com/619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed ordering problem when configuring with `-make <part>'Rohan McGovern2011-05-261-14/+24
| | | | | | | | | | | | | | | | Prior to this change, running configure with the `-make' option would affect the order in which parts of Qt are built. This is unintuitive and would easily cause build failures. For example, configuring with `./configure -make demos' would attempt to build demos before building libs, which, of course, would fail. Refactor the code so that the result is the same regardless of the order of `-make' options. Change-Id: Idfa61834a0f01d0628a9a1ae27ece94ae3647e6d Reviewed-on: http://codereview.qt.nokia.com/128 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix -nomake tests.Lincoln Ramsay2011-05-251-4/+2
| | | | | | | It now means "don't run qmake", not just "don't build". This is consistent with -nomake demos and -nomake examples Reviewed-by: Rohan Mcgovern
* tests: enable compilation of autotests for qtbase by defaultRohan McGovern2011-05-111-4/+7
| | | | | | | | | Tests are now treated like examples and demos: compiled by default, unless you configured with `-nomake tests'. (They are still not installed by default, however.) Reviewed-by: Jason McDonald Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
* Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-021-0/+6
|
* Fixed "make check" target for qtbase.axis2011-04-271-0/+6
| | | | It was caused by a missing "tests" target.
* Build examples and demos in qtbaseMarius Storm-Olsen2011-04-271-10/+1
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-31/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+172
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12