diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-27 09:45:52 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-27 09:45:52 +0200 |
commit | 0f1f7fb97fd0dd572ad61a0ebaef68c2bba72e57 (patch) | |
tree | e1f3f1b58aa69904e6bc629e88ed68fca858f83a /tests/auto/widgets/styles/qstyle/images | |
parent | e8c70fb07f01b492b721451c00496f860eb40be0 (diff) | |
parent | 5bb178c479a247720fbc3fbb7f06a32b725193ac (diff) |
Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/kernel/qwidgetrepaintmanager.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Ifae457d0427be8e2465e474b055722e11b3b1e5c
Diffstat (limited to 'tests/auto/widgets/styles/qstyle/images')
15 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/widgets/styles/qstyle/images/mac/button.png b/tests/auto/widgets/styles/qstyle/images/mac/button.png Binary files differdeleted file mode 100644 index 7b11325e87..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/button.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/combobox.png b/tests/auto/widgets/styles/qstyle/images/mac/combobox.png Binary files differdeleted file mode 100644 index ded0b11f29..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/combobox.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/lineedit.png b/tests/auto/widgets/styles/qstyle/images/mac/lineedit.png Binary files differdeleted file mode 100644 index 8d2861b65b..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/lineedit.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/mdi.png b/tests/auto/widgets/styles/qstyle/images/mac/mdi.png Binary files differdeleted file mode 100644 index 8c09ae4338..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/mdi.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/menu.png b/tests/auto/widgets/styles/qstyle/images/mac/menu.png Binary files differdeleted file mode 100644 index 5dd9111d69..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/menu.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png Binary files differdeleted file mode 100644 index 8828e220a2..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/slider.png b/tests/auto/widgets/styles/qstyle/images/mac/slider.png Binary files differdeleted file mode 100644 index fc65035631..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/slider.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/mac/spinbox.png b/tests/auto/widgets/styles/qstyle/images/mac/spinbox.png Binary files differdeleted file mode 100644 index ee88441ecb..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/mac/spinbox.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/button.png b/tests/auto/widgets/styles/qstyle/images/vista/button.png Binary files differdeleted file mode 100644 index a6c45276ca..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/button.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/combobox.png b/tests/auto/widgets/styles/qstyle/images/vista/combobox.png Binary files differdeleted file mode 100644 index 9b82f64d32..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/combobox.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png b/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png Binary files differdeleted file mode 100644 index b2c6ac1ae4..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/menu.png b/tests/auto/widgets/styles/qstyle/images/vista/menu.png Binary files differdeleted file mode 100644 index b114099cc3..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/menu.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png Binary files differdeleted file mode 100644 index c8aa7864df..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/slider.png b/tests/auto/widgets/styles/qstyle/images/vista/slider.png Binary files differdeleted file mode 100644 index 7c156ded9d..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/slider.png +++ /dev/null diff --git a/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png b/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png Binary files differdeleted file mode 100644 index b8d0823ab2..0000000000 --- a/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png +++ /dev/null |