diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 20:18:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 20:18:14 +0100 |
| commit | 4159ee840549df11287294f0928e90f35f3e06ff (patch) | |
| tree | 4a3947e37d54bdb78b4042e9ced20dbf181b5a2c /src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp | |
| parent | 59dbf1786f22ec4ac88d8f9d38cac5cfb82acaea (diff) | |
| parent | c8c39ecc37c156ac2677de09a26548dfc274b564 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
config.tests/unix/ptrsize.test
configure
src/corelib/global/qnamespace.h
src/network/socket/qabstractsocket.cpp
tests/auto/other/networkselftest/networkselftest.pro
Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672
Diffstat (limited to 'src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp')
| -rw-r--r-- | src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp index 2f6865c9dd..074b214f80 100644 --- a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp +++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp @@ -116,7 +116,7 @@ void CustomView::mousePressEvent(QMouseEvent *event) if (QGraphicsItem *item = itemAt(event->pos())) { qDebug() << "You clicked on item" << item; } else { - qDebug() << "You didn't click on an item."; + qDebug("You didn't click on an item."); } } //! [6] |