summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc2
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp2
-rw-r--r--src/widgets/kernel/qapplication.cpp21
-rw-r--r--src/widgets/kernel/qapplication_p.h2
-rw-r--r--src/widgets/kernel/qwidget.cpp16
-rw-r--r--src/widgets/styles/qstyle.cpp4
-rw-r--r--src/widgets/styles/qstyleoption.cpp12
-rw-r--r--src/widgets/widgets/qcombobox.cpp4
8 files changed, 38 insertions, 25 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 8f0f0f32c7..9e6bd1b62d 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -843,7 +843,7 @@
\l{#selected-ps}{:selected},
and \l{#checked-ps}{:checked} pseudo states.
- Sort indicator in can be styled using the
+ The sort indicator can be styled using the
\l{#up-arrow-sub}{::up-arrow} and the
\l{#down-arrow-sub}{::down-arrow} Sub-control.
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index a10b95f701..cd38f4b282 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -2029,6 +2029,8 @@ QTableWidgetItem *QTableWidget::horizontalHeaderItem(int column) const
/*!
Sets the horizontal header item for column \a column to \a item.
+ If necessary, the column count is increased to fit the item.
+ The previous header item (if there was one) is deleted.
*/
void QTableWidget::setHorizontalHeaderItem(int column, QTableWidgetItem *item)
{
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 7b51028e6e..70c91b9aa4 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -399,8 +399,6 @@ void qt_cleanup();
QStyle *QApplicationPrivate::app_style = 0; // default application style
bool QApplicationPrivate::overrides_native_style = false; // whether native QApplication style is
// overridden, i.e. not native
-QString QApplicationPrivate::styleOverride; // style override
-
#ifndef QT_NO_STYLE_STYLESHEET
QString QApplicationPrivate::styleSheet; // default application stylesheet
#endif
@@ -466,6 +464,13 @@ QDesktopWidget *qt_desktopWidget = 0; // root window widgets
*/
void QApplicationPrivate::process_cmdline()
{
+ if (!styleOverride.isEmpty()) {
+ if (app_style) {
+ delete app_style;
+ app_style = 0;
+ }
+ }
+
// process platform-indep command line
if (!qt_is_gui_used || !argc)
return;
@@ -481,13 +486,8 @@ void QApplicationPrivate::process_cmdline()
QByteArray arg = argv[i];
if (arg.startsWith("--"))
arg.remove(0, 1);
- QString s;
if (arg == "-qdevel" || arg == "-qdebug") {
// obsolete argument
- } else if (arg.indexOf("-style=", 0) != -1) {
- s = QString::fromLocal8Bit(arg.right(arg.length() - 7).toLower());
- } else if (arg == "-style" && i < argc-1) {
- s = QString::fromLocal8Bit(argv[++i]).toLower();
#ifndef QT_NO_STYLE_STYLESHEET
} else if (arg == "-stylesheet" && i < argc -1) {
styleSheet = QLatin1String("file:///");
@@ -501,13 +501,6 @@ void QApplicationPrivate::process_cmdline()
} else {
argv[j++] = argv[i];
}
- if (!s.isEmpty()) {
- if (app_style) {
- delete app_style;
- app_style = 0;
- }
- styleOverride = s;
- }
}
if(j < argc) {
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index ba8d7ff63c..75d86a5eba 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -219,8 +219,6 @@ public:
static QApplicationPrivate *instance() { return self; }
- static QString styleOverride;
-
#ifdef QT_KEYPAD_NAVIGATION
static QWidget *oldEditFocus;
static Qt::NavigationMode navigationMode;
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index efa032453f..14eb368973 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -4711,9 +4711,11 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
if (QWidget *p = q->parentWidget()) {
if (!p->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) {
if (!naturalFont.isCopyOf(QApplication::font())) {
- QFont inheritedFont = p->font();
- inheritedFont.resolve(inheritedMask);
- naturalFont = inheritedFont.resolve(naturalFont);
+ if (inheritedMask != 0) {
+ QFont inheritedFont = p->font();
+ inheritedFont.resolve(inheritedMask);
+ naturalFont = inheritedFont.resolve(naturalFont);
+ } // else nothing to do (naturalFont = naturalFont)
} else {
naturalFont = p->font();
}
@@ -4721,9 +4723,11 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
}
#ifndef QT_NO_GRAPHICSVIEW
else if (extra && extra->proxyWidget) {
- QFont inheritedFont = extra->proxyWidget->font();
- inheritedFont.resolve(inheritedMask);
- naturalFont = inheritedFont.resolve(naturalFont);
+ if (inheritedMask != 0) {
+ QFont inheritedFont = extra->proxyWidget->font();
+ inheritedFont.resolve(inheritedMask);
+ naturalFont = inheritedFont.resolve(naturalFont);
+ } // else nothing to do (naturalFont = naturalFont)
}
#endif //QT_NO_GRAPHICSVIEW
}
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 5f9f0b8e75..9bca11b992 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -898,7 +898,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value CE_ToolBoxTabLabel The toolbox's tab label.
\value CE_HeaderEmptyArea The area of a header view where there are no header sections.
- \value CE_ShapedFrame The frame with the shape specified in the QStyleOptionFrameV3; see QFrame.
+ \value CE_ShapedFrame The frame with the shape specified in the QStyleOptionFrame; see QFrame.
\omitvalue CE_ColumnViewGrip
@@ -1036,7 +1036,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\omitvalue SE_ViewItemCheckIndicator
\value SE_FrameContents Area for a frame's contents.
- \value SE_ShapedFrameContents Area for a frame's contents using the shape in QStyleOptionFrameV3; see QFrame
+ \value SE_ShapedFrameContents Area for a frame's contents using the shape in QStyleOptionFrame; see QFrame
\value SE_FrameLayoutItem Area that counts for the parent layout.
\value SE_HeaderArrow Area for the sort indicator for a header.
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index cab56e329e..d66dbec472 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -475,6 +475,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
/*!
\typedef QStyleOptionFrameV2
\relates QStyleOptionFrame
+ \obsolete
Synonym for QStyleOptionFrame.
*/
@@ -482,6 +483,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
/*!
\typedef QStyleOptionFrameV3
\relates QStyleOptionFrame
+ \obsolete
Synonym for QStyleOptionFrame.
*/
@@ -1253,6 +1255,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
/*!
\typedef QStyleOptionTabV2
\relates QStyleOptionTab
+ \obsolete
Synonym for QStyleOptionTab.
*/
@@ -1260,6 +1263,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
/*!
\typedef QStyleOptionTabV3
\relates QStyleOptionTab
+ \obsolete
Synonym for QStyleOptionTab.
*/
@@ -1497,6 +1501,7 @@ QStyleOptionTab::QStyleOptionTab(int version)
/*!
\typedef QStyleOptionProgressBarV2
\relates QStyleOptionProgressBar
+ \obsolete
Synonym for QStyleOptionProgressBar.
*/
@@ -2270,6 +2275,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
/*!
\typedef QStyleOptionDockWidgetV2
\relates QStyleOptionDockWidget
+ \obsolete
Synonym for QStyleOptionDockWidget.
*/
@@ -2675,6 +2681,7 @@ QStyleOptionComboBox::QStyleOptionComboBox(int version)
/*!
\typedef QStyleOptionToolBoxV2
\relates QStyleOptionToolBox
+ \obsolete
Synonym for QStyleOptionToolBox.
*/
@@ -3012,6 +3019,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
/*!
\typedef QStyleOptionViewItemV2
\relates QStyleOptionViewItem
+ \obsolete
Synonym for QStyleOptionViewItem.
*/
@@ -3019,6 +3027,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
/*!
\typedef QStyleOptionViewItemV3
\relates QStyleOptionViewItem
+ \obsolete
Synonym for QStyleOptionViewItem.
*/
@@ -3026,6 +3035,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
/*!
\typedef QStyleOptionViewItemV4
\relates QStyleOptionViewItem
+ \obsolete
Synonym for QStyleOptionViewItem.
*/
@@ -3298,6 +3308,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
/*!
\typedef QStyleOptionTabWidgetFrameV2
\relates QStyleOptionTabWidgetFrame
+ \obsolete
Synonym for QStyleOptionTabWidgetFrame.
*/
@@ -3447,6 +3458,7 @@ QStyleOptionTabWidgetFrame::QStyleOptionTabWidgetFrame(int version)
/*!
\typedef QStyleOptionTabBarBaseV2
\relates QStyleOptionTabBarBase
+ \obsolete
Synonym for QStyleOptionTabBarBase.
*/
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 2a1742b652..deffad432f 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -3244,6 +3244,9 @@ void QComboBox::keyReleaseEvent(QKeyEvent *e)
#ifndef QT_NO_WHEELEVENT
void QComboBox::wheelEvent(QWheelEvent *e)
{
+#ifdef Q_OS_DARWIN
+ Q_UNUSED(e);
+#else
Q_D(QComboBox);
if (!d->viewContainer()->isVisible()) {
int newIndex = currentIndex();
@@ -3264,6 +3267,7 @@ void QComboBox::wheelEvent(QWheelEvent *e)
}
e->accept();
}
+#endif
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 12:03:55 +0000