diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-09-22 18:48:42 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-23 19:38:12 +0200 |
| commit | c81d0586b5f22715ce66d0f14cf079424700358b (patch) | |
| tree | be6a224cba9598cc4dcc892c82145c3cfc2d91f3 /src/widgets/widgets/qtabbar_p.h | |
| parent | 58b08ba40b849864ceb2c08f65b0be08ac6fa47a (diff) | |
De-inline virtuals of some non-exported private classes in QtGui
This is to work around a bug in GCC 4.7's link-time optimiser. Without
it, linking QtOpenGL and QtPrintSupport fails because the compiler
generates the code for the virtuals, including the virtual table, but
not the methods.
Change-Id: Idcecd51c32e6228e0eefe67f1bd630ea1f5d5da7
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/widgets/widgets/qtabbar_p.h')
| -rw-r--r-- | src/widgets/widgets/qtabbar_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 8c6e70b8d7..b7b6998ca3 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -126,11 +126,9 @@ public: TabBarAnimation(Tab *t, QTabBarPrivate *_priv) : tab(t), priv(_priv) { setEasingCurve(QEasingCurve::InOutQuad); } - void updateCurrentValue(const QVariant ¤t) - { priv->moveTab(priv->tabList.indexOf(*tab), current.toInt()); } + void updateCurrentValue(const QVariant ¤t); - void updateState(State, State newState) - { if (newState == Stopped) priv->moveTabFinished(priv->tabList.indexOf(*tab)); } + void updateState(State, State newState); private: //these are needed for the callbacks Tab *tab; |