From b262472973a5765a7888e227a905f98a33dc21aa Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Tue, 6 Oct 2009 14:43:05 +0200
Subject: [PATCH] Centralize S60 check, also use it for adding the GDB TRK
 page.

---
 qtcreator.pri                                   | 4 ++++
 src/plugins/debugger/gdb/gdb.pri                | 5 +++++
 src/plugins/debugger/gdb/gdbengine.cpp          | 3 ++-
 src/plugins/qt4projectmanager/qt-s60/qt-s60.pri | 4 +---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/qtcreator.pri b/qtcreator.pri
index f9bdb63993b..42fb50e36cf 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -108,3 +108,7 @@ linux-g++-* {
     # to prevent checking in code that does not compile on other platforms.
     QMAKE_LFLAGS += -Wl,--allow-shlib-undefined -Wl,--no-undefined
 }
+
+# Handle S60 support: default on Windows, conditionally built on other platforms.
+win32:SUPPORT_QT_S60=1
+else:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
diff --git a/src/plugins/debugger/gdb/gdb.pri b/src/plugins/debugger/gdb/gdb.pri
index 344f724eebd..5dc9fc83734 100644
--- a/src/plugins/debugger/gdb/gdb.pri
+++ b/src/plugins/debugger/gdb/gdb.pri
@@ -1,5 +1,10 @@
 include(../../../shared/trk/trk.pri)
 
+!isEmpty(SUPPORT_QT_S60) {
+    message("Adding experimental support for Qt/S60 applications.")
+    DEFINES += QTCREATOR_WITH_S60
+}
+
 HEADERS += \
     $$PWD/gdbmi.h \
     $$PWD/gdbengine.h \
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index dfd9e954104..b92e8e7b548 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4227,8 +4227,9 @@ void GdbEngine::handleAdapterShutdownFailed(const QString &msg)
 void GdbEngine::addOptionPages(QList<Core::IOptionsPage*> *opts) const
 {
     opts->push_back(new GdbOptionsPage);
-    if (!qgetenv("QTCREATOR_WITH_S60").isEmpty())
+#ifdef QTCREATOR_WITH_S60
         opts->push_back(new TrkOptionsPage(m_trkAdapter->options()));
+#endif
 }
 
 void GdbEngine::showMessageBox(int icon, const QString &title, const QString &text)
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
index 6fb44d1cbbb..d6663216928 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
@@ -1,6 +1,4 @@
-win32:SUPPORT_QT_S60=1
-else:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
-!isEmpty(SUPPORT_QT_S60) { 
+!isEmpty(SUPPORT_QT_S60) {
     message("Adding experimental support for Qt/S60 applications.")
     DEFINES += QTCREATOR_WITH_S60
     SOURCES += $$PWD/s60devices.cpp \