diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-05 09:40:07 +0200 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-09-05 13:06:50 +0200 |
| commit | 7378ce329741099cc063229ed6e2e6db93a5e9c1 (patch) | |
| tree | bcbcb9b6c93d5a9cc77aceea533a4e1e3bebc97f /src/src.pro | |
| parent | cb44e648096ba28512abd4d6145af6973695bc6e (diff) | |
| download | qt-creator-7378ce329741099cc063229ed6e2e6db93a5e9c1.tar.gz | |
Make compilation with "qmake" instead of "qmake -r" work again.
The dependencies between app and libs are a bit more complicated now,
since qmake must run on app (to generate app_version.h) before the
utils lib is compiled.
Change-Id: I836683b80810ad35d296366f89bb1d2a98a3afb4
Reviewed-on: http://codereview.qt.nokia.com/4180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 2f986ab2e1..1b542eb908 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,9 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = \ + libs/aggregation \ # needed by extensionsystem + libs/extensionsystem \ # needed by app + app \ # needed by libs/utils for app_version.h libs \ - app \ plugins \ tools |