Commit 7378ce32 authored by Eike Ziller's avatar Eike Ziller Committed by Daniel Molkentin
Browse files

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: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent cb44e648
...@@ -2,11 +2,11 @@ TEMPLATE = subdirs ...@@ -2,11 +2,11 @@ TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
QT += core gui QT += core gui
# aggregation and extensionsystem are directly in src.pro
# because of dependencies of app
SUBDIRS = \ SUBDIRS = \
3rdparty \ 3rdparty \
qtconcurrent \ qtconcurrent \
aggregation \
extensionsystem \
utils \ utils \
utils/process_stub.pro \ utils/process_stub.pro \
languageutils \ languageutils \
......
...@@ -2,7 +2,9 @@ TEMPLATE = subdirs ...@@ -2,7 +2,9 @@ TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = \ SUBDIRS = \
libs/aggregation \ # needed by extensionsystem
libs/extensionsystem \ # needed by app
app \ # needed by libs/utils for app_version.h
libs \ libs \
app \
plugins \ plugins \
tools tools
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment