Changeset 651 for trunk/src/gui/dialogs/qmessagebox.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qmessagebox.cpp (modified) (6 diffs)

trunk/src/gui/dialogs/qmessagebox.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -59 +59 @@
 #include <QtGui/qapplication.h>
 #include <QtGui/qtextedit.h>
+
 #include <QtGui/qmenu.h>
 #include "qdialog_p.h"
@@ -189 +190 @@
     QAbstractButton *detectedEscapeButton;
     QLabel *informativeLabel;
-#ifdef Q_OS_SYMBIAN
-    QTextEdit *textEdit;
+#if
+    QText;
 #endif
     QPointer<QObject> receiverToDisconnectOnClose;
@@ -1727 +1728 @@
         "<p>Please see <a href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensing</a> "
         "for an overview of Qt licensing.</p>"
-        "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
+        "<p>Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).</p>"
         "<p>Qt is a Nokia product. See <a href=\"http://qt.nokia.com/\">qt.nokia.com</a> "
         "for more information.</p>"
@@ -2463 +2464 @@
         label->setWordWrap(true);
         QGridLayout *grid = static_cast<QGridLayout *>(layout());
-#ifdef Q_OS_SYMBIAN
+#if
         label->hide();
-        QTextEdit *textEdit = new QTextEdit(this);
-        textEdit->setReadOnly(true);
-        grid->addWidget(textEdit, 1, 1, 1, 1);
-        d->textEdit = textEdit;
+        QText(this);
+        text(true);
+        grid->addWidget(text, 1, 1, 1, 1);
+        d->text;
 #else
         grid->addWidget(label, 1, 1, 1, 1);
@@ -2476 +2477 @@
     d->informativeLabel->setText(text);
 
-#ifdef Q_OS_SYMBIAN
-    //We need to put the informative label inside textEdit to enable scrolling of long texts.
-    d->textEdit->setText(d->informativeLabel->text());
+#if
+    //We need to put the informative label inside text to enable scrolling of long texts.
+    d->text->setText(d->informativeLabel->text());
 #endif