diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-11 10:49:32 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-11 13:13:40 (GMT) |
| commit | 814f7d3d607edacca091273302297b6b2674424f (patch) | |
| tree | e4856f48032b5da15f4008e0acc6dbf09310c1e2 | |
| parent | fd252f78e907bb998fc654c0332cfd2adfaf8b1e (diff) | |
| download | Qt-814f7d3d607edacca091273302297b6b2674424f.zip Qt-814f7d3d607edacca091273302297b6b2674424f.tar.gz Qt-814f7d3d607edacca091273302297b6b2674424f.tar.bz2 | |
Fix compiler warning in QT_REQUIRE_VERSION
warning: format not a string literal and no format arguments
Task-number: QTBUG-8967
Reviewed-by: Gabriel
| -rw-r--r-- | src/gui/dialogs/qmessagebox.h | 2 | ||||
| -rw-r--r-- | tests/auto/qmessagebox/tst_qmessagebox.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/dialogs/qmessagebox.h b/src/gui/dialogs/qmessagebox.h index bc6170d..f1ff6cc 100644 --- a/src/gui/dialogs/qmessagebox.h +++ b/src/gui/dialogs/qmessagebox.h @@ -354,7 +354,7 @@ if (!qApp){ \ QString s = QApplication::tr("Executable '%1' requires Qt "\ "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\ str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\ -"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal(s.toLatin1().data()); }} +"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal("%s", s.toLatin1().data()); }} #endif // QT_NO_MESSAGEBOX diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index 2de1c52..d4ca064 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -140,6 +140,8 @@ private: tst_QMessageBox::tst_QMessageBox() : keyToSend(-1) { + int argc = qApp->argc(); + QT_REQUIRE_VERSION(argc, qApp->argv(), "4.6.2") } int tst_QMessageBox::exec(QMessageBox *msgBox, int key) |