diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:24:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:28:42 +0100 |
| commit | a02863234d76abb6c9f289026ae4ea3145924f30 (patch) | |
| tree | aef6381d0000a78ba69ac80eb03739b1c8ca5fc3 /src/gui/itemmodels/qstandarditemmodel.cpp | |
| parent | e77b13621f0057374d83a2b884f03dd2e5b7b88c (diff) | |
| parent | e4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
mkspecs/common/wince/qplatformdefs.h
src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
Diffstat (limited to 'src/gui/itemmodels/qstandarditemmodel.cpp')
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 9b0c6163b4..6f30f0ea25 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -3009,7 +3009,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const itemsSet << item; stack.push(item); } else { - qWarning() << "QStandardItemModel::mimeData: No item associated with invalid index"; + qWarning("QStandardItemModel::mimeData: No item associated with invalid index"); return 0; } } |