summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr <donald.carr@nokia.com>2012-06-06 15:54:55 +0000
committerQt by Nokia <qt-info@nokia.com>2012-06-07 04:16:49 +0200
commitb194575b8541fba380a80f4db2d950e694c808d2 (patch)
treee18ed3bb95b2f7d9c39f1274a5c1324eead18f1a
parentef30a591219ca80ee9c745e9953f785be98828df (diff)
Fix common device spec paths
This fixes breakage in the Raspberry Pi spec introduced in: https://codereview.qt-project.org/#change,27536 due to incorrect depth assumptions regarding included files. Change-Id: I802b828f1755f299939fed192dd3ca9bf1a83002 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
-rw-r--r--mkspecs/devices/common/linux_device_pre.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index e0f744af3e..51f04d9e7b 100644
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -7,9 +7,9 @@ CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
-include(../../../common/linux.conf)
-include(../../../common/gcc-base-unix.conf)
-include(../../../common/g++-unix.conf)
+include(../../common/linux.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
!load(device_config) {
error(Could not successfully load device configuration)