diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-30 15:59:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-30 15:59:07 +0200 |
| commit | 57ae91c5efd856832ffb913af3aa4ba28ae1d787 (patch) | |
| tree | 081f38620739883901125a89182715356abbbf84 /src/libs/utils | |
| parent | 90a7786ddedc1c417895cc1a9b7c866afd59730b (diff) | |
| parent | bc7abeb6021c1705fbd94ea5362f16a1c3325835 (diff) | |
| download | qt-creator-57ae91c5efd856832ffb913af3aa4ba28ae1d787.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
doc/qtcreator.qdoc
qtcreator.pri
Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
Diffstat (limited to 'src/libs/utils')
| -rw-r--r-- | src/libs/utils/detailswidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp index 922aea8a64..c74ab6e6fd 100644 --- a/src/libs/utils/detailswidget.cpp +++ b/src/libs/utils/detailswidget.cpp @@ -110,17 +110,18 @@ DetailsWidgetPrivate::DetailsWidgetPrivate(QWidget *parent) : summaryLayout->setSpacing(0); m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse); - m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); m_summaryLabel->setContentsMargins(0, 0, 0, 0); summaryLayout->addWidget(m_summaryLabel); - m_summaryCheckBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + m_summaryCheckBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); m_summaryCheckBox->setAttribute(Qt::WA_LayoutUsesWidgetRect); /* broken layout on mac otherwise */ m_summaryCheckBox->setVisible(false); m_summaryCheckBox->setContentsMargins(0, 0, 0, 0); summaryLayout->addWidget(m_summaryCheckBox); m_additionalSummaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); + m_additionalSummaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); m_additionalSummaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN); m_additionalSummaryLabel->setWordWrap(true); m_additionalSummaryLabel->setVisible(false); |