summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/moc.prf
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation when including files created in shadow dirsThiago Macieira2014-02-101-0/+2
| | | | | | | | | | | | For normal #includes, moc simply ignores the missing file, but it could generate problems later. It's a problem when the file being sought is the FILE from plugin metadata. A very good example of this is Qt Creator: coreplugin.h:49: Error: Plugin Metadata file "Core.json" does not exist. Change-Id: I16af04b477f52c6bd53c14147ec777b358dfdf50 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* resolve include paths against source dirOswald Buddenhagen2014-01-291-1/+4
| | | | | | | | | this hasn't happened yet at this point of processing, so we'd pass bogus paths when shadow-building. Change-Id: I9f9633c0dbc2aadeff1eb555a8e598ddb0837e37 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* shell-quote include paths when not using a response fileOswald Buddenhagen2014-01-291-1/+3
| | | | | | Change-Id: I7557480dcd8ba1e0b5ecf88318c53cdfb3519f92 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use the response file also for the default incdirsOswald Buddenhagen2014-01-291-2/+2
| | | | | | Change-Id: I328cdd32d43f263992af206c66b502564e954d53 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use write_file() to create the response file with the includesOswald Buddenhagen2014-01-291-36/+11
| | | | | | | | it's much shorter and faster. Change-Id: I6a37e9ece4ac550d1887fa53523b85046d398c8c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for using -isystem in qmakeThiago Macieira2014-01-201-1/+2
| | | | | | | | | This commit will make qmake use -isystem automatically for any compilers that declare support for it for any paths that are listed in QMAKE_DEFAULT_INCDIRS. Change-Id: I36fefc6d5bba61671f65669f0ea42704b3c3cf31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Ensure that the mkspec and source dirs are passed to moc on WindowsThiago Macieira2014-01-161-3/+3
| | | | | | | | | Those paths need not be in INCLUDEPATH: qmake always adds them to the compiler command-line and we should match the behavior if we expand INCLUDEPATH here. Change-Id: I89508d15ac534b54ae873a42c4ad9764408042b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix whitespace issues in *.prfAxel Waggershauser2013-03-221-2/+2
| | | | | | | | Replaced tabs with spaces to align with space-indented code and removed some trailing whitespace. Change-Id: I4930afc3df206ef8ee96de3e69f0d69fc4a1c77c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* append $$QMAKE_DEFAULT_INCDIRS to moc invocationsOswald Buddenhagen2013-03-151-1/+1
| | | | | | | | | unlike the real compiler, moc does not have these directories built in, so it would not find headers from a system install of qt. Task-number: QTBUG-28870 Change-Id: I86f18cdc8953145190163746dae59f4e784f2d78 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* de-duplicate code a bitOswald Buddenhagen2013-03-151-4/+6
| | | | | Change-Id: I35cd81e308c512bdec50de1f19ae9c708012afa0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove overuse of $$list()Oswald Buddenhagen2013-03-151-2/+2
| | | | | Change-Id: I383b0af8c37acd9dc34a8cf5718f4d850099b64b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* simplify code by using new $$absolute_path() functionOswald Buddenhagen2012-12-071-4/+1
| | | | | | Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless conditionals+branchesOswald Buddenhagen2012-09-191-3/+1
| | | | | | | | the surrounding TEMPLATE == vc* scope already implies vcproj, as dsp is not supported any more. Change-Id: I68363aca62e21135f42572040ccc7b189dcf32c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove backwards compatibility hacksOswald Buddenhagen2012-06-191-7/+0
| | | | | | | | | | there won't be terribly many projects relying on it. now's the time to find out for sure ... this reverts commit 3279b07302fde0eb14f9b197c9ad2e14d512817e Change-Id: Id36687ab3bfc7dd5ce35b584621a8f5b3ee00fc9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove automatic building of moc from moc.prfOswald Buddenhagen2012-03-081-6/+0
| | | | | | | | the problem this (probably) tried to solve has been solved via ordered builds a *long* time ago. Change-Id: I84c58076c864735eea4210ec60aa060fe3e5d97e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake: remove symbian supportJoerg Bornemann2011-11-071-1/+1
| | | | | Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* added QMAKE_MOC_OPTIONS variable to qmakeKeno Fischer2011-09-071-2/+2
| | | | | | | | | | Merge-request: 41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I8d492e9fbdbeeffa9f702a3a1f2fab314586809f Reviewed-on: http://codereview.qt-project.org/4375 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+116
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