Commit Graph

161 Commits

Author SHA1 Message Date
David Boddie
0748751c9f Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
2011-05-23 14:24:07 +02:00
Morten Sorvig
e0e696dd05 Remove QMAKE_MACOS_DEPLOYMENT_TARGET.
Not needed any more, 10.5 and up supports setting
the deployment target/minimum version on the
compiler command line.
2011-05-19 09:18:46 +02:00
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
Christian Kandeler
bc88f528dc qmake: Introduce new template type
The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point).

Reviewed-by: Joerg Bornemann
(cherry picked from commit 56443421cb5e537e60abd7ced42c9ebf587683fe)
2011-05-10 12:54:55 +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
61e6639c82 qmake vc(x)proj generator: support x64 Qt builds
Task-number: QTBUG-17911
Reviewed-by: ossi
2011-05-06 11:50:15 +02:00
Joerg Bornemann
c6fc5395ad qmake: remove dead code from VcxprojGenerator
Reviewed-by: ossi
2011-05-06 11:50:03 +02: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