diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:46:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:49:28 +0100 |
| commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
| tree | f165b7bc319548fb0082365411a871028f92e89e /examples/widgets/painting/gradients | |
| parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
| parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'examples/widgets/painting/gradients')
| -rw-r--r-- | examples/widgets/painting/gradients/gradients.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp index f3da5f3de5..ffca9f5560 100644 --- a/examples/widgets/painting/gradients/gradients.cpp +++ b/examples/widgets/painting/gradients/gradients.cpp @@ -362,7 +362,7 @@ GradientWidget::GradientWidget(QWidget *parent) connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource())); #ifdef QT_OPENGL_SUPPORT connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool))); -#endif +#endif connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool))); connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer->hoverPoints(), SLOT(setDisabled(bool))); |