From acda1c57ed8cf776dabfdf1eeca77c995a690185 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 5 Feb 2010 13:39:47 +0100
Subject: [PATCH] Fix shadow builds.
Move dependencies up.
---
src/plugins/debugger/debugger_dependencies.pri | 1 +
src/plugins/debugger/gdb/gdb.pri | 1 -
src/plugins/qt4projectmanager/qt-s60/qt-s60.pri | 2 +-
.../qt4projectmanager/qt4projectmanager_dependencies.pri | 1 +
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/debugger_dependencies.pri b/src/plugins/debugger/debugger_dependencies.pri
index 2701df45bab..7a5d3f09e04 100644
--- a/src/plugins/debugger/debugger_dependencies.pri
+++ b/src/plugins/debugger/debugger_dependencies.pri
@@ -5,3 +5,4 @@ include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../libs/cplusplus/cplusplus.pri)
include(../../libs/utils/utils.pri)
+include(../../libs/symbianutils/symbianutils.pri)
diff --git a/src/plugins/debugger/gdb/gdb.pri b/src/plugins/debugger/gdb/gdb.pri
index 873186c21ae..edf30bac20b 100644
--- a/src/plugins/debugger/gdb/gdb.pri
+++ b/src/plugins/debugger/gdb/gdb.pri
@@ -1,4 +1,3 @@
-include(../../../libs/symbianutils/symbianutils.pri)
HEADERS += \
$$PWD/gdbmi.h \
$$PWD/gdbengine.h \
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
index 8937b5b0b83..0ea427366d0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
@@ -31,4 +31,4 @@ HEADERS += $$PWD/s60devices.h \
$$PWD/rvctparser.h \
$$PWD/winscwparser.h
FORMS += $$PWD/s60devicespreferencepane.ui
-include(../../libs/symbianutils/symbianutils.pri)||error("could not include symbianutils.pri")
+
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
index 59284cb3d25..5e11deb8b51 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
@@ -4,3 +4,4 @@ include(../../plugins/cppeditor/cppeditor.pri)
include(../../plugins/help/help.pri)
include(../../plugins/designer/designer.pri)
include(../../plugins/debugger/debugger.pri)
+include(../../libs/symbianutils/symbianutils.pri)
--
GitLab