aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-03-27 16:37:51 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-02 17:13:51 +0200
commit89a1f062b7d1fc58ad4d94f701f6bc08706a2345 (patch)
tree7b4d446089b9a1571332b7334897cee5e13de32c
parentb343e9333ed651363ed0a6ecdae08c218e0c4785 (diff)
undo bizarre build order fiddling
libs/utils does not depend on app_version.h any more. This reverts commit 7378ce329741099cc063229ed6e2e6db93a5e9c1. Change-Id: Ib4a60a6587d93952b15228793320d8dd99e2d475 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/libs/libs.pro4
-rw-r--r--src/src.pro4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index a677e474c7..1daf730098 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -1,9 +1,9 @@
TEMPLATE = subdirs
CONFIG += ordered
-# aggregation and extensionsystem are directly in src.pro
-# because of dependencies of app
SUBDIRS = \
+ aggregation \
+ extensionsystem \
utils \
utils/process_stub.pro \
languageutils \
diff --git a/src/src.pro b/src/src.pro
index 1b542eb908..2f986ab2e1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,9 +2,7 @@ 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