Commit b2624729 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Centralize S60 check, also use it for adding the GDB TRK page.

parent ff0cb8fa
...@@ -108,3 +108,7 @@ linux-g++-* { ...@@ -108,3 +108,7 @@ linux-g++-* {
# to prevent checking in code that does not compile on other platforms. # to prevent checking in code that does not compile on other platforms.
QMAKE_LFLAGS += -Wl,--allow-shlib-undefined -Wl,--no-undefined 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)
include(../../../shared/trk/trk.pri) include(../../../shared/trk/trk.pri)
!isEmpty(SUPPORT_QT_S60) {
message("Adding experimental support for Qt/S60 applications.")
DEFINES += QTCREATOR_WITH_S60
}
HEADERS += \ HEADERS += \
$$PWD/gdbmi.h \ $$PWD/gdbmi.h \
$$PWD/gdbengine.h \ $$PWD/gdbengine.h \
......
...@@ -4227,8 +4227,9 @@ void GdbEngine::handleAdapterShutdownFailed(const QString &msg) ...@@ -4227,8 +4227,9 @@ void GdbEngine::handleAdapterShutdownFailed(const QString &msg)
void GdbEngine::addOptionPages(QList<Core::IOptionsPage*> *opts) const void GdbEngine::addOptionPages(QList<Core::IOptionsPage*> *opts) const
{ {
opts->push_back(new GdbOptionsPage); opts->push_back(new GdbOptionsPage);
if (!qgetenv("QTCREATOR_WITH_S60").isEmpty()) #ifdef QTCREATOR_WITH_S60
opts->push_back(new TrkOptionsPage(m_trkAdapter->options())); opts->push_back(new TrkOptionsPage(m_trkAdapter->options()));
#endif
} }
void GdbEngine::showMessageBox(int icon, const QString &title, const QString &text) void GdbEngine::showMessageBox(int icon, const QString &title, const QString &text)
......
win32:SUPPORT_QT_S60=1 !isEmpty(SUPPORT_QT_S60) {
else:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
!isEmpty(SUPPORT_QT_S60) {
message("Adding experimental support for Qt/S60 applications.") message("Adding experimental support for Qt/S60 applications.")
DEFINES += QTCREATOR_WITH_S60 DEFINES += QTCREATOR_WITH_S60
SOURCES += $$PWD/s60devices.cpp \ SOURCES += $$PWD/s60devices.cpp \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment