56 Commits

Author	SHA1	Message	Date
Rohan McGovern	152a10012c	Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile ... Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make. This would break in the case where the correct makefile was not named `Makefile'. The included autotest demonstrates the problem. Note that this was fixed for normal targets back in 2005 by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not fixed for extra targets. Reviewed-by: ossi (cherry picked from commit 96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30)	2011-05-13 08:59:43 +10:00
Oswald Buddenhagen	c1077e9fb6	don't ignore create_prl for static plugins ... Task-number: QTBUG-18436 Reviewed-by: joerg (cherry picked from commit 2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1)	2011-05-11 16:39:47 +02:00
Marius Storm-Olsen	9fe4482de1	Fix Makefile subtargets ... Commit c04b7a55d1 broke subtargets so every rule would just make 'first' (implicitly)	2011-05-07 03:19:51 +00:00
Joerg Bornemann	c04b7a55d1	qmake nmake generator: pass MAKEFLAGS to sub-make calls ... Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi	2011-05-03 13:31:12 +02:00
Marius Storm-Olsen	bd06459179	Make qmake respect <subdir>.CONFIG = no_default_install ... It already respects no_default_target	2011-04-27 12:05:58 +02:00
Qt by Nokia	38be0d1383	Initial import from the monolithic Qt. ... 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	2011-04-27 12:05:43 +02:00