summaryrefslogtreecommitdiffstats
path: root/tests/auto/q3sqlcursor
diff options
context:
space:
mode:
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-09-28 13:00:54 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-09-28 13:00:54 (GMT)
commitf3a36a7e59b24bc388ed15372f941bf649bc5ae4 (patch)
tree5486e561a12afc189ad0451c4cadf0f85e105328 /tests/auto/q3sqlcursor
parentb0885663f2192eb5eb27f8a8032e7e05b19e3736 (diff)
parentf9d6862d13ae38c59ec4a58092c8126620801e0b (diff)
downloadQt-f3a36a7e59b24bc388ed15372f941bf649bc5ae4.zip
Qt-f3a36a7e59b24bc388ed15372f941bf649bc5ae4.tar.gz
Qt-f3a36a7e59b24bc388ed15372f941bf649bc5ae4.tar.bz2
Merge commit 'origin/4.5' into 4.6
Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'tests/auto/q3sqlcursor')
-rw-r--r--tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
index cbbab41..6b580df 100644
--- a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
+++ b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
@@ -646,7 +646,7 @@ void tst_Q3SqlCursor::select()
}
#ifdef QT_DEBUG
- // for people too stupid to read docs we had to insert this debugging message.
+ // Ignore debugging message advising users of a potential pitfall.
QTest::ignoreMessage(QtDebugMsg, "Q3SqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
#endif
cur4.setValue( "id", 1 );