summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt.prf
Commit message (Collapse)AuthorAgeFilesLines
* fix misnomer: $$resolve_depends() => $$sort_depends()Oswald Buddenhagen2011-07-111-1/+1
| | | | | | | | | ... and re-add a real $$resolve_depends(), just in case. Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7 Reviewed-on: http://codereview.qt.nokia.com/1455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* make 1st argument of $$resolve_depends a variableOswald Buddenhagen2011-07-111-1/+1
| | | | | | | | | | this is braindead, but it's consistent with the rest of qmake and more performant. and the argument error message claimed it already anyway. Change-Id: I973368acc6ffbff17107085ccd68b0334cc3e681 Reviewed-on: http://codereview.qt.nokia.com/1436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Only add dependent include when not already thereMarius Storm-Olsen2011-05-271-1/+1
| | | | | | Change-Id: I517ad8188a6f6b5ade763f0189f434f446ab6f05 Reviewed-on: http://codereview.qt.nokia.com/198 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-041-1/+17
|\
| * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+17
| | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
* | QT += declarative implies += opengl too, so hardcode it to make stuff workGunnar Sletta2011-04-281-0/+3
|/
* Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when neededMarius Storm-Olsen2011-04-271-0/+5
|
* Made modules that depend on other modules add their include paths.Marius Storm-Olsen2011-04-271-0/+6
| | | | | | | | This is needed so that header files which contain references to those modules (for example in templates) will have their include paths as well. RevBy: axis
* Make qt.prf use new qt_module.pri structure for QT variableMarius Storm-Olsen2011-04-271-71/+16
| | | | This change requires the new resolve_depends(var, prefix) function in qmake.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+221
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 01:38:57 +0000