diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /src/widgets/widgets | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.
Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp
Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.
Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/widgets/widgets')
25 files changed, 61 insertions, 61 deletions
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 5e9d100214..c96f77cbf2 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -380,7 +380,7 @@ void QAbstractButtonPrivate::moveFocus(int key) QAbstractButton *fb = qobject_cast<QAbstractButton *>(f); if (!fb || !buttonList.contains(fb)) return; - + QAbstractButton *candidate = 0; int bestScore = -1; QRect target = f->rect().translated(f->mapToGlobal(QPoint(0,0))); diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 391a06917c..b27bc2fff8 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -452,7 +452,7 @@ void QAbstractScrollAreaPrivate::layoutChildren() // no corner widget. Also, on the Mac we paint if there is a native // (transparent) sizegrip in the area where a corner widget would be. if ((needv && needh && hasCornerWidget == false && scrollOverlap == 0) - || ((needv || needh) + || ((needv || needh) #ifdef Q_WS_MAC && hasMacSizeGrip #endif diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp index 5932e1be9b..5372b21430 100644 --- a/src/widgets/widgets/qabstractslider.cpp +++ b/src/widgets/widgets/qabstractslider.cpp @@ -724,7 +724,7 @@ bool QAbstractSliderPrivate::scrollByDelta(Qt::Orientation orientation, Qt::Keyb #else // Native UI-elements on Mac can scroll hundreds of lines at a time as // a result of acceleration. So keep the same behaviour in Qt, and - // don't restrict stepsToScroll to certain maximum (pageStep): + // don't restrict stepsToScroll to certain maximum (pageStep): stepsToScroll = int(offset_accumulated); #endif offset_accumulated -= int(offset_accumulated); diff --git a/src/widgets/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h index 42f25501b1..7b07aa3be9 100644 --- a/src/widgets/widgets/qabstractslider_p.h +++ b/src/widgets/widgets/qabstractslider_p.h @@ -87,7 +87,7 @@ public: QBasicTimer repeatActionTimer; int repeatActionTime; QAbstractSlider::SliderAction repeatAction; - + #ifdef QT_KEYPAD_NAVIGATION int origValue; diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp index 3da81f8360..2bd67d19e1 100644 --- a/src/widgets/widgets/qbuttongroup.cpp +++ b/src/widgets/widgets/qbuttongroup.cpp @@ -139,7 +139,7 @@ \fn void QButtonGroup::buttonPressed(QAbstractButton *button) \since 4.2 - This signal is emitted when the given \a button is pressed down. + This signal is emitted when the given \a button is pressed down. \sa QAbstractButton::pressed() */ @@ -158,7 +158,7 @@ \fn void QButtonGroup::buttonReleased(QAbstractButton *button) \since 4.2 - This signal is emitted when the given \a button is released. + This signal is emitted when the given \a button is released. \sa QAbstractButton::released() */ diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 0fdf039bc3..d61ae023ef 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -2591,7 +2591,7 @@ QCalendarWidget::HorizontalHeaderFormat QCalendarWidget::horizontalHeaderFormat( } -/*! +/*! \enum QCalendarWidget::VerticalHeaderFormat This enum type defines the various formats the vertical header can display. diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 0004e3d5ab..4676668610 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -282,8 +282,8 @@ private: QComboBox *mCombo; }; -// Note that this class is intentionally not using QStyledItemDelegate -// Vista does not use the new theme for combo boxes and there might +// Note that this class is intentionally not using QStyledItemDelegate +// Vista does not use the new theme for combo boxes and there might // be other side effects from using the new class class QComboBoxDelegate : public QItemDelegate { Q_OBJECT diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp index 7631014905..6c15e9016f 100644 --- a/src/widgets/widgets/qdockarealayout.cpp +++ b/src/widgets/widgets/qdockarealayout.cpp @@ -2004,7 +2004,7 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*> //we need to make sure the element is in the list so the dock widget can eventually be docked correctly if (!testing) item_list.append(item); - + //here we need to make sure we change the item in the item_list QDockAreaLayoutItem &lastItem = testing ? item : item_list.last(); diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp index 8cd944e133..c43ed9848b 100644 --- a/src/widgets/widgets/qeffects.cpp +++ b/src/widgets/widgets/qeffects.cpp @@ -276,7 +276,7 @@ void QAlphaWidget::render() #endif // Q_OS_WIN widget->hide(); } else { - //Since we are faking the visibility of the widget + //Since we are faking the visibility of the widget //we need to unset the hidden state on it before calling show widget->setAttribute(Qt::WA_WState_Hidden, true); widget->show(); @@ -541,7 +541,7 @@ void QRollEffect::scroll() #endif widget->hide(); } else { - //Since we are faking the visibility of the widget + //Since we are faking the visibility of the widget //we need to unset the hidden state on it before calling show widget->setAttribute(Qt::WA_WState_Hidden, true); widget->show(); diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 6c8da10b8e..a491b3218b 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -121,7 +121,7 @@ void QGroupBox::initStyleOption(QStyleOptionGroupBox *option) const option->state |= QStyle::State_Sunken; } - if (!option->palette.isBrushSet(isEnabled() ? QPalette::Active : + if (!option->palette.isBrushSet(isEnabled() ? QPalette::Active : QPalette::Disabled, QPalette::WindowText)) option->textColor = QColor(style()->styleHint(QStyle::SH_GroupBox_TextLabelColor, option, this)); @@ -229,7 +229,7 @@ void QGroupBoxPrivate::init() overCheckBox = false; pressedControl = QStyle::SC_None; calculateFrame(); - q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, + q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::GroupBox)); } diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index cfe32df3cc..cdef4c4548 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -95,7 +95,7 @@ protected: void changeEvent(QEvent *event); void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); void initStyleOption(QStyleOptionGroupBox *option) const; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 5187968ddf..5155df8e23 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -139,9 +139,9 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const The length of the text can be constrained to maxLength(). The text can be arbitrarily constrained using a validator() or an - inputMask(), or both. When switching between a validator and an input mask - on the same line edit, it is best to clear the validator or input mask to - prevent undefined behavior. + inputMask(), or both. When switching between a validator and an input mask + on the same line edit, it is best to clear the validator or input mask to + prevent undefined behavior. A related class is QTextEdit which allows multi-line, rich text diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 7f800d831f..10329293b3 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -180,7 +180,7 @@ void QLineEditPrivate::init(const QString& txt) #endif QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)), q, SLOT(updateMicroFocus())); - + QObject::connect(control, SIGNAL(textChanged(QString)), q, SLOT(updateMicroFocus())); diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm index 1eadb62d5c..7077772be4 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm @@ -112,7 +112,7 @@ QMacCocoaViewContainerPrivate::~QMacCocoaViewContainerPrivate() /*! \fn QMacCocoaViewContainer::QMacCocoaViewContainer(void *cocoaViewToWrap, QWidget *parent) - + Create a new QMacCocoaViewContainer using the NSView pointer in \a cocoaViewToWrap with parent, \a parent. QMacCocoaViewContainer will retain \a cocoaViewToWrap. diff --git a/src/widgets/widgets/qmenu_wince.cpp b/src/widgets/widgets/qmenu_wince.cpp index 68a2022e97..ec1560f5e2 100644 --- a/src/widgets/widgets/qmenu_wince.cpp +++ b/src/widgets/widgets/qmenu_wince.cpp @@ -116,14 +116,14 @@ static void resolveAygLibs() } } -static void qt_wce_enable_soft_key(HWND handle, uint command) +static void qt_wce_enable_soft_key(HWND handle, uint command) { resolveAygLibs(); if (ptrEnableSoftKey) ptrEnableSoftKey(handle, command, false, true); } -static void qt_wce_disable_soft_key(HWND handle, uint command) +static void qt_wce_disable_soft_key(HWND handle, uint command) { resolveAygLibs(); if (ptrEnableSoftKey) @@ -148,7 +148,7 @@ static QAction* qt_wce_get_quit_action(QList<QAction *> actionItems) QAction *action = actionItems.at(i); if (action->menuRole() == QAction::QuitRole) returnAction = action; - else + else if (action->menu()) returnAction = qt_wce_get_quit_action(action->menu()->actions()); if (returnAction) @@ -252,7 +252,7 @@ static void qt_wce_insert_action(HMENU menu, QWceMenuAction *action) if (action->action->isCheckable()) if (action->action->isChecked()) CheckMenuItem(menu, action->command, MF_BYCOMMAND | MF_CHECKED); - else + else CheckMenuItem(menu, action->command, MF_BYCOMMAND | MF_UNCHECKED); } } @@ -264,8 +264,8 @@ static void qt_wce_clear_menu(HMENU hMenu) } /*! - \internal - + \internal + This function refreshes the native Windows CE menu. */ @@ -281,8 +281,8 @@ void QMenuBarPrivate::wceRefresh() } /*! - \internal - + \internal + This function sends native Windows CE commands to Qt menus. */ @@ -293,8 +293,8 @@ QAction* QMenu::wceCommands(uint command) } /*! - \internal - + \internal + This function sends native Windows CE commands to Qt menu bars and all their child menus. */ @@ -457,7 +457,7 @@ void QMenuPrivate::QWceMenuPrivate::addAction(QWceMenuAction *action, QWceMenuAc /*! \internal - + This function will return the HMENU used to create the native Windows CE menu bar bindings. */ @@ -642,7 +642,7 @@ void QMenuBarPrivate::QWceMenuBarPrivate::rebuild() qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, leftButtonAction->text()); qt_wce_enable_soft_key(menubarHandle, leftButtonCommand); } else { - qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, QLatin1String("")); + qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, QLatin1String("")); qt_wce_disable_soft_key(menubarHandle, leftButtonCommand); } } else { diff --git a/src/widgets/widgets/qmenu_wince.rc b/src/widgets/widgets/qmenu_wince.rc index 631cd9d47a..0bcd32c7e5 100644 --- a/src/widgets/widgets/qmenu_wince.rc +++ b/src/widgets/widgets/qmenu_wince.rc @@ -14,19 +14,19 @@ #define I_IMAGENONE (-2) #define NOMENU 0xFFFF -IDR_MAIN_MENU MENU DISCARDABLE +IDR_MAIN_MENU MENU DISCARDABLE BEGIN POPUP "Menu" BEGIN - MENUITEM "About", IDM_ABOUT + MENUITEM "About", IDM_ABOUT END END -IDR_MAIN_MENU2 MENU DISCARDABLE +IDR_MAIN_MENU2 MENU DISCARDABLE BEGIN POPUP "Menu" BEGIN - MENUITEM "About", IDM_ABOUT + MENUITEM "About", IDM_ABOUT END POPUP "Display" BEGIN @@ -35,7 +35,7 @@ BEGIN END -IDR_MAIN_MENU3 MENU DISCARDABLE +IDR_MAIN_MENU3 MENU DISCARDABLE BEGIN POPUP "Menu1" BEGIN @@ -55,7 +55,7 @@ BEGIN END END -IDR_MAIN_MENU4 MENU DISCARDABLE +IDR_MAIN_MENU4 MENU DISCARDABLE BEGIN POPUP "Menu1" BEGIN @@ -83,7 +83,7 @@ BEGIN END END -IDR_MAIN_MENU5 MENU DISCARDABLE +IDR_MAIN_MENU5 MENU DISCARDABLE BEGIN POPUP "Menu1" BEGIN @@ -119,8 +119,8 @@ BEGIN END END -STRINGTABLE -BEGIN +STRINGTABLE +BEGIN IDS_EXIT "Exit" IDS_MENU "Menu" IDS_LEFTMENU "Display" @@ -136,31 +136,31 @@ END IDR_MAIN_MENU SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU, + IDR_MAIN_MENU, 2, I_IMAGENONE, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_EXIT, 0, NOMENU, - + I_IMAGENONE, IDM_MENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_MENU, 0, 0, END IDR_MAIN_MENU2 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU2, + IDR_MAIN_MENU2, 2, I_IMAGENONE, IDM_LEFTMENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_LEFTMENU, 0, 1, - + I_IMAGENONE, IDM_MENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_MENU, 0, 0, END IDR_MAIN_MENU3 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU3, + IDR_MAIN_MENU3, 4, I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, @@ -178,7 +178,7 @@ END IDR_MAIN_MENU4 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU4, + IDR_MAIN_MENU4, 6, I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, @@ -202,7 +202,7 @@ END IDR_MAIN_MENU5 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU5, + IDR_MAIN_MENU5, 8, I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index 1638123e0e..3154c0dedb 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -103,7 +103,7 @@ public: private: Q_DISABLE_COPY(QPushButton) Q_DECLARE_PRIVATE(QPushButton) -#ifndef QT_NO_MENU +#ifndef QT_NO_MENU Q_PRIVATE_SLOT(d_func(), void _q_popupPressed()) #endif }; diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp index 590225e850..0de63a5a47 100644 --- a/src/widgets/widgets/qscrollarea.cpp +++ b/src/widgets/widgets/qscrollarea.cpp @@ -240,7 +240,7 @@ QWidget *QScrollArea::widget() const The \a widget becomes a child of the scroll area, and will be destroyed when the scroll area is deleted or when a new widget is set. - + The widget's \l{QWidget::setAutoFillBackground()}{autoFillBackground} property will be set to \c{true}. diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index 3711b2f43e..4b24c9dfef 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -80,7 +80,7 @@ public: be shown during application startup. \inmodule QtWidgets - + A splash screen is a widget that is usually displayed when an application is being started. Splash screens are often used for applications that have long start up times (e.g. database or diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index a8399ed8d5..e39b79c67a 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1665,7 +1665,7 @@ bool QSplitter::restoreState(const QByteArray &state) have a stretch factor of \a stretch. \a stretch is not the effective stretch factor; the effective - stretch factor is calculated by taking the initial size of the + stretch factor is calculated by taking the initial size of the widget and multiplying it with \a stretch. This function is provided for convenience. It is equivalent to diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index 880ddfaf35..4c9be611bb 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -534,7 +534,7 @@ void QStatusBar::reformat() } /*! - + Hides the normal status indications and displays the given \a message for the specified number of milli-seconds (\a{timeout}). If \a{timeout} is 0 (default), the \a {message} remains displayed until @@ -744,7 +744,7 @@ bool QStatusBar::event(QEvent *e) } } } - + // On Mac OS X Leopard it is possible to drag the window by clicking // on the tool bar on most applications. #ifndef Q_WS_MAC @@ -755,7 +755,7 @@ bool QStatusBar::event(QEvent *e) // Enable drag-click only if the status bar is the status bar for a // QMainWindow with a unifed toolbar. - if (parent() == 0 || qobject_cast<QMainWindow *>(parent()) == 0 || + if (parent() == 0 || qobject_cast<QMainWindow *>(parent()) == 0 || qobject_cast<QMainWindow *>(parent())->unifiedTitleAndToolBarOnMac() == false ) return QWidget::event(e); diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp index 02279ad014..969bb8a7fd 100644 --- a/src/widgets/widgets/qtoolbararealayout.cpp +++ b/src/widgets/widgets/qtoolbararealayout.cpp @@ -810,7 +810,7 @@ QLayoutItem *QToolBarAreaLayout::insertToolBar(QToolBar *before, QToolBar *toolB QInternal::DockPosition pos = findToolBar(before); if (pos == QInternal::DockCount) return 0; - + return docks[pos].insertToolBar(before, toolBar); } @@ -869,7 +869,7 @@ void QToolBarAreaLayout::insertItem(QToolBar *before, QLayoutItem *item) QInternal::DockPosition pos = findToolBar(before); if (pos == QInternal::DockCount) return; - + docks[pos].insertItem(before, item); } diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index 5cbb4a4756..e052a71044 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -169,7 +169,7 @@ public: void removeToolBar(QToolBar *toolBar); void insertToolBarBreak(QToolBar *before); void removeToolBarBreak(QToolBar *before); - void moveToolBar(QToolBar *toolbar, int pos); + void moveToolBar(QToolBar *toolbar, int pos); QList<int> gapIndex(const QPoint &pos, int *maxDistance) const; bool insertGap(const QList<int> &path, QLayoutItem *item); @@ -215,7 +215,7 @@ public: void insertToolBarBreak(QToolBar *before); void removeToolBarBreak(QToolBar *before); void addToolBarBreak(QInternal::DockPosition pos); - void moveToolBar(QToolBar *toolbar, int pos); + void moveToolBar(QToolBar *toolbar, int pos); void insertItem(QInternal::DockPosition pos, QLayoutItem *item); void insertItem(QToolBar *before, QLayoutItem *item); diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 1dde9c0a1d..7a4f3b17d0 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -409,7 +409,7 @@ void QToolBarLayout::setGeometry(const QRect &rect) } } #endif - + } bool QToolBarLayout::layoutActions(const QSize &size) diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 797f3e9b76..9780d3c24c 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -145,7 +145,7 @@ SOURCES += \ false:mac { HEADERS += widgets/qmacnativewidget_mac.h \ widgets/qmaccocoaviewcontainer_mac.h - OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \ + OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \ widgets/qcocoamenu_mac_p.h OBJECTIVE_SOURCES += widgets/qmaccocoaviewcontainer_mac.mm \ widgets/qcocoatoolbardelegate_mac.mm \ |