From 700732683779a862091b19336ef980801e412395 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 9 Mar 2011 22:00:08 +0100
Subject: clean up DEPENDPATH insanity

simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
---
 qtcreator.pri | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'qtcreator.pri')

diff --git a/qtcreator.pri b/qtcreator.pri
index c80fe934d8..0d89a74624 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -127,10 +127,7 @@ INCLUDEPATH += \
     $$IDE_SOURCE_TREE/tools \
     $$IDE_SOURCE_TREE/src/plugins
 
-DEPENDPATH += \
-    $$IDE_SOURCE_TREE/src/libs \
-    $$IDE_SOURCE_TREE/tools \
-    $$IDE_SOURCE_TREE/src/plugins
+CONFIG += depend_includepath
 
 LIBS += -L$$IDE_LIBRARY_PATH
 
-- 
cgit v1.2.1


From 75f819848f4240dc8d8e0c03a292aec9182fdcc3 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 8 Mar 2011 12:57:12 +0100
Subject: Symbian: Remove S60devices

Remove S60devices and all the code surrounding it. This gets rid of
the S60 devices tab in the options dialog, too.

Tasknumber: QTCREATORBUG-3681
Reviewed-by: dt
---
 qtcreator.pri | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'qtcreator.pri')

diff --git a/qtcreator.pri b/qtcreator.pri
index 0d89a74624..a2215a28b1 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -156,7 +156,3 @@ win32-msvc* {
     #Don't warn about sprintf, fopen etc being 'unsafe'
     DEFINES += _CRT_SECURE_NO_WARNINGS
 }
-
-# Handle S60 support: default on Windows, conditionally built on other platforms.
-macx:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
-else:SUPPORT_QT_S60=1
-- 
cgit v1.2.1