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/qinputdialog.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/qinputdialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qinputdialog.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 1c52282ad5..808858a711 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -232,11 +232,7 @@ void QInputDialogPrivate::ensureLayout() mainLayout = new QVBoxLayout(q); //we want to let the input dialog grow to available size on Symbian. -#ifndef Q_OS_SYMBIAN mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); -#else - label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -#endif mainLayout->addWidget(label); mainLayout->addWidget(inputWidget); mainLayout->addWidget(buttonBox); @@ -563,9 +559,6 @@ void QInputDialog::setLabelText(const QString &text) } else { d->label->setText(text); } -#ifdef Q_OS_SYMBIAN - d->label->setWordWrap(true); -#endif } QString QInputDialog::labelText() const |