summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/default_pre.prf
Commit message (Collapse)AuthorAgeFilesLines
...
* Ensure we pass -developer-build to syncqt for -nokia-developer buildsMarius Storm-Olsen2011-06-111-5/+13
| | | | | | | | | | | | | | When the build directory is the install directory, separate modules should use qtbase as the path for libs, module pris etc. This fixes the logic in default_pre.prf so that syncqt is called correctly in these cases. Change-Id: Ib3798bfd145d3a3e43b9a222af46270245e6c2e6 Reviewed-on: http://codereview.qt.nokia.com/464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Eckhart Koppen <eckhart.koppen@nokia.com>
* Make qmake slightly more verbose with its syncqt output.axis2011-06-061-3/+5
| | | | | | | | | | It can be hidden with -silent, however. Change-Id: I6dbd3c743779b8d2070e41f007df26b530987429 Reviewed-on: http://codereview.qt.nokia.com/235 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Implemented module-local caching of module profiles.axis2011-06-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | We use syncqt to generate .qmake.cache also for submodules, which contains the location of forwarding module profiles for that module. This enables us to build without having to put module profiles into mkspecs/modules until install time. Also added support for -developer-build to syncqt. What it does is to point build directories for binaries and libraries to a common location in QtBase. This is more convenient when doing development, since you don't need to set your path to every module's bin/ directory, but it cannot be used with release builds, since they need to build independently of QtBase, in their own directory. Change-Id: I959c62c11c644f2147a98da894a72452d9c44327 Task: QTBUG-19585 Task: QTBUG-19583 Reviewed-on: http://codereview.qt.nokia.com/232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Don't base QTDIR detection on .qmake.cache.axis2011-06-031-7/+0
| | | | | | | | Change-Id: I4adc26c1c070d26277551d302f4638b819ddc311 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/231 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Do not continue if syncqt fails.Lincoln Ramsay2011-05-251-1/+5
| | | | | | | | | | If the user has set QTDIR to something other than the location of the qtbase build directory, syncqt will fail. This change prevents the build from continuing. Ideally, the system should ignore the user-set QTDIR value or give an appropriate error. Reviewed-by: Rohan McGovern
* Made sure syncqt gets called correctly even if it is not in the PATH.axis2011-04-271-1/+2
|
* Have qmake run syncqt automatically, if sync.profile is detectedMarius Storm-Olsen2011-04-271-0/+28
| | | | | | | This will normally only happen for top-level pro files, and syncqt is smart enough to not touch already existing files. And in edition, syncqt uses the original file's timestamp on the fwding files.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+3
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