summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/itemmodels/qstandarditemmodel.cpp1
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 13d7a5c7a7..079be121d5 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -2714,7 +2714,6 @@ bool QStandardItemModel::hasChildren(const QModelIndex &parent) const
*/
QModelIndex QStandardItemModel::sibling(int row, int column, const QModelIndex &idx) const
{
- Q_D(const QStandardItemModel);
return createIndex(row, column, idx.internalPointer());
}
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 405a16d488..b5756bd06c 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -927,7 +927,7 @@ xcb_timestamp_t QXcbConnection::getTimestamp()
// to add the new set of events to its event queue
while (true) {
connection()->sync();
- if (event = checkEvent(checker))
+ if ((event = checkEvent(checker)))
break;
}