diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:27 -0600 |
| commit | 67ac950eb8660dc7f455640ffe77fd36b2fa44af (patch) | |
| tree | 025f297b116786a8df77f42a264eaec5ec34be94 /qtinterface/qt4/Qt/qmessagebox.h | |
| parent | 9ba1ac7f1c73233eb133f35babbcbb7f89dabb50 (diff) | |
| download | tqtinterface-67ac950eb8660dc7f455640ffe77fd36b2fa44af.tar.gz tqtinterface-67ac950eb8660dc7f455640ffe77fd36b2fa44af.zip | |
Undo prior accidental commit
Diffstat (limited to 'qtinterface/qt4/Qt/qmessagebox.h')
| -rw-r--r-- | qtinterface/qt4/Qt/qmessagebox.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qtinterface/qt4/Qt/qmessagebox.h b/qtinterface/qt4/Qt/qmessagebox.h index 77e1e46..d3617b7 100644 --- a/qtinterface/qt4/Qt/qmessagebox.h +++ b/qtinterface/qt4/Qt/qmessagebox.h @@ -342,7 +342,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons) #define QT_REQUIRE_VERSION(argc, argv, str) { QString s = QString::fromLatin1(str);\ -QString sq = QString::fromLatin1(tqVersion()); \ +QString sq = QString::fromLatin1(qVersion()); \ if ((sq.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\ (sq.section(QChar::fromLatin1('.'),1,1).toInt()<<8)+\ sq.section(QChar::fromLatin1('.'),2,2).toInt()<(s.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\ @@ -353,8 +353,8 @@ if (!qApp){ \ } \ QString s = QApplication::tr("Executable '%1' requires Qt "\ "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\ -str)).arg(QString::fromLatin1(tqVersion())); QMessageBox::critical(0, QApplication::tr(\ -"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); tqFatal(s.toLatin1().data()); }} +str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\ +"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal(s.toLatin1().data()); }} #endif // QT_NO_MESSAGEBOX |