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>

src/libs/libs.pro

@@ -2,11 +2,11 @@ TEMPLATE  = subdirs
 CONFIG   += ordered
 QT += core gui
 
+# aggregation and extensionsystem are directly in src.pro
+# because of dependencies of app
 SUBDIRS   = \
     3rdparty \
     qtconcurrent \
-    aggregation \
-    extensionsystem \
     utils \
     utils/process_stub.pro \
     languageutils \

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