Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/dialogs/qprintpreviewdialog.cpp

    r651 r769  
    274274    QVBoxLayout *vboxLayout = new QVBoxLayout;
    275275    vboxLayout->setContentsMargins(0, 0, 0, 0);
     276#ifdef Q_WS_MAC
     277    // We query the widgets about their size and then we fix the size.
     278    // This should do the trick for the laying out part...
     279    QSize pageNumEditSize, pageNumLabelSize;
     280    pageNumEditSize = pageNumEdit->minimumSizeHint();
     281    pageNumLabelSize = pageNumLabel->minimumSizeHint();
     282    pageNumEdit->resize(pageNumEditSize);
     283    pageNumLabel->resize(pageNumLabelSize);
     284#endif
    276285    QFormLayout *formLayout = new QFormLayout;
     286#ifdef Q_WS_MAC
     287    // We have to change the growth policy in Mac.
     288    formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
     289#endif
    277290    formLayout->setWidget(0, QFormLayout::LabelRole, pageNumEdit);
    278291    formLayout->setWidget(0, QFormLayout::FieldRole, pageNumLabel);
Note: See TracChangeset for help on using the changeset viewer.