diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/dialogs/qmessagebox.h | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'src/dialogs/qmessagebox.h')
| -rw-r--r-- | src/dialogs/qmessagebox.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/qmessagebox.h index 781efd1..338525b 100644 --- a/src/dialogs/qmessagebox.h +++ b/src/dialogs/qmessagebox.h @@ -209,13 +209,13 @@ private: // Disabled copy constructor and operator= * } */ #define QT_REQUIRE_VERSION( argc, argv, str ) { QString s=QString::fromLatin1(str);\ -QString sq=QString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ +QString sq=QString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \ QApplication(argc,argv);} QString s = QApplication::tr("Executable '%1' requires Qt "\ "%2, found Qt %3.").arg(QString::fromLatin1(qAppName())).arg(QString::fromLatin1(\ -str)).arg(QString::fromLatin1(tqVersion()) ); QMessageBox::critical( 0, QApplication::tr(\ -"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); tqFatal(s.ascii()); }} +str)).arg(QString::fromLatin1(qVersion()) ); QMessageBox::critical( 0, QApplication::tr(\ +"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); qFatal(s.ascii()); }} #endif // QT_NO_MESSAGEBOX |