diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-11 08:24:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-11 08:25:04 +0100 |
| commit | d456f87ece0323982b7601047712545ab95426ad (patch) | |
| tree | 46b90468b01144615f280620d73763fc189d25ac /examples | |
| parent | cc2938b5b6aa07210b04bd48ad8a2830701a06e5 (diff) | |
| parent | 4fc070a4192d5b914b6f814a8dcab3f552d9abac (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qfilesystemwatcher_win.cpp
src/corelib/plugin/plugin.pri
src/plugins/platforms/cocoa/qcocoaaccessibility.mm
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/ipc/sharedmemory/qt.png | bin | 2383 -> 2991 bytes | |||
| -rw-r--r-- | examples/opengl/qopenglwidget/qt.png | bin | 5174 -> 2991 bytes | |||
| -rw-r--r-- | examples/widgets/dialogs/standarddialogs/dialog.cpp | 1 | ||||
| -rw-r--r-- | examples/widgets/itemviews/pixelator/images/qt.png | bin | 656 -> 1506 bytes | |||
| -rw-r--r-- | examples/widgets/mainwindows/mainwindow/qt.png | bin | 2037 -> 2991 bytes |
5 files changed, 0 insertions, 1 deletions
diff --git a/examples/corelib/ipc/sharedmemory/qt.png b/examples/corelib/ipc/sharedmemory/qt.png Binary files differindex 60ef558efe..4f68e162de 100644 --- a/examples/corelib/ipc/sharedmemory/qt.png +++ b/examples/corelib/ipc/sharedmemory/qt.png diff --git a/examples/opengl/qopenglwidget/qt.png b/examples/opengl/qopenglwidget/qt.png Binary files differindex 79e383cf50..4f68e162de 100644 --- a/examples/opengl/qopenglwidget/qt.png +++ b/examples/opengl/qopenglwidget/qt.png diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index b28cf0f934..462ba211c0 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -103,7 +103,6 @@ Dialog::Dialog(QWidget *parent) QHBoxLayout *horizontalLayout = new QHBoxLayout(this); QGroupBox *groupBox = new QGroupBox(QGuiApplication::applicationDisplayName(), this); horizontalLayout->addWidget(groupBox); - horizontalLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Ignored)); verticalLayout = new QVBoxLayout(groupBox); } else { verticalLayout = new QVBoxLayout(this); diff --git a/examples/widgets/itemviews/pixelator/images/qt.png b/examples/widgets/itemviews/pixelator/images/qt.png Binary files differindex a2c9c77c16..dd197cb59c 100644 --- a/examples/widgets/itemviews/pixelator/images/qt.png +++ b/examples/widgets/itemviews/pixelator/images/qt.png diff --git a/examples/widgets/mainwindows/mainwindow/qt.png b/examples/widgets/mainwindows/mainwindow/qt.png Binary files differindex 48fa9fc2ef..4f68e162de 100644 --- a/examples/widgets/mainwindows/mainwindow/qt.png +++ b/examples/widgets/mainwindows/mainwindow/qt.png |
