diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-12-20 16:17:28 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-12-20 16:21:13 +0100 |
| commit | 689903164a3c8637aac095c76d82a9b5e4156675 (patch) | |
| tree | b75b95f28e4a263054a919699724dff80942fb81 /src/libs/qtcreatorcdbext | |
| parent | cd63f3865fde3700ba09cec4b410cfb8dd21f42d (diff) | |
| download | qt-creator-689903164a3c8637aac095c76d82a9b5e4156675.tar.gz | |
qtcreatorcdbext: Simplify Qt 5 code.
Change-Id: I3c62cd7d371312bed1c1c3f5220af86d64143e88
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/libs/qtcreatorcdbext')
| -rw-r--r-- | src/libs/qtcreatorcdbext/gdbmihelpers.cpp | 3 | ||||
| -rw-r--r-- | src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 3 | ||||
| -rw-r--r-- | src/libs/qtcreatorcdbext/symbolgroupvalue.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/libs/qtcreatorcdbext/gdbmihelpers.cpp b/src/libs/qtcreatorcdbext/gdbmihelpers.cpp index af77c72d99..936d601043 100644 --- a/src/libs/qtcreatorcdbext/gdbmihelpers.cpp +++ b/src/libs/qtcreatorcdbext/gdbmihelpers.cpp @@ -636,8 +636,7 @@ std::string widgetAt(const SymbolGroupValueContext &ctx, int x, int y, std::stri const QtInfo &qtInfo = QtInfo::get(ctx); const std::string func = qtInfo.prependQtModule("QApplication::widgetAt", - qtInfo.version >= 5 && QtInfo::qt5WidgetSplit ? - QtInfo::Widgets : QtInfo::Gui); + qtInfo.version >= 5 ? QtInfo::Widgets : QtInfo::Gui); const SymbolList symbols = SymbolGroupValue::resolveSymbol(func.c_str(), ctx, errorMessage); if (symbols.empty()) return std::string(); // Not a gui application, likely diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp index 931ec571fe..d8e345fbd4 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp +++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp @@ -652,8 +652,7 @@ const QtInfo &QtInfo::get(const SymbolGroupValueContext &ctx) rc.qObjectPrivateType = rc.prependQtCoreModule("QObjectPrivate"); rc.qWindowPrivateType = rc.prependQtGuiModule("QWindowPrivate"); rc.qWidgetPrivateType = - rc.prependQtModule("QWidgetPrivate", - rc.version >= 5 && qt5WidgetSplit ? Widgets : Gui); + rc.prependQtModule("QWidgetPrivate", rc.version >= 5 ? Widgets : Gui); if (SymbolGroupValue::verbose) DebugPrint() << rc; return rc; diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.h b/src/libs/qtcreatorcdbext/symbolgroupvalue.h index aef48fc0e2..9f88304fb3 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupvalue.h +++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.h @@ -171,8 +171,6 @@ std::ostream &operator<<(std::ostream &, const SymbolGroupValue &v); struct QtInfo { - enum { qt5WidgetSplit = 0 }; - enum Module { Core, Gui, Widgets, Network, Script |