diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-20 16:36:05 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 21:29:46 +0200 |
commit | fc14bd2c92d42aa055ce634e246820cef426ec9c (patch) | |
tree | 1403dd2d11621d36a4d2a7ec2e986a5b85bcbf2d /src/widgets/dialogs/qmessagebox.cpp | |
parent | c7df1af337e0d5a013a2f1c17bb14df083769410 (diff) |
Widgets: Remove Q_WS_QPA and qpa-sections from .pro files.
Enable compilation without -qpa.
- Remove conditionals from Q_WS_QPA sections.
- Rename precompiled header.
- Remove gui-related Q_OS_SYMBIAN-#ifdef sections.
- Leave other Q_WS code in for reference.
Change-Id: I16326b631fff483aec8edd2f7a2e7a1822eab814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 96b8e46570..93e9a34415 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -223,9 +223,6 @@ public: bool autoAddOkButton; QAbstractButton *detectedEscapeButton; QLabel *informativeLabel; -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - QTextBrowser *textBrowser; -#endif QPointer<QObject> receiverToDisconnectOnClose; QByteArray memberToDisconnectOnClose; QByteArray signalToDisconnectOnClose; @@ -307,7 +304,7 @@ void QMessageBoxPrivate::updateSize() return; QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size(); -#if defined(Q_WS_QWS) || defined(Q_WS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_WS_QWS) || defined(Q_WS_WINCE) // the width of the screen, less the window border. int hardLimit = screenSize.width() - (q->frameGeometry().width() - q->geometry().width()); #else @@ -2498,24 +2495,10 @@ void QMessageBox::setInformativeText(const QString &text) #endif label->setWordWrap(true); QGridLayout *grid = static_cast<QGridLayout *>(layout()); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - label->hide(); - QTextBrowser *textBrowser = new QTextBrowser(this); - textBrowser->setOpenExternalLinks(true); - grid->addWidget(textBrowser, 1, 1, 1, 1); - d->textBrowser = textBrowser; -#else grid->addWidget(label, 1, 1, 1, 1); -#endif d->informativeLabel = label; } d->informativeLabel->setText(text); - -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - //We need to put the informative label inside textBrowser to enable scrolling of long texts. - d->textBrowser->setText(d->informativeLabel->text()); -#endif - d->updateSize(); } |