diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-25 10:30:51 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-25 10:31:42 +0200 |
commit | 7767cd8291afdb78bc91bed706fc94899057510c (patch) | |
tree | 3b7b7f5dda0df3a4f320a51f8e740cfd1742dcaf /doc/images | |
parent | f48ec98e0ce9f202738ec317a595c015b98c61f7 (diff) | |
parent | a5bd56386dc392e6c756240f094c582f3b3ee497 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
* origin/5.6:
change button background color from white to black
change about-b2qt background to white
doc: update demos used in docs
export wayland demo
Update qtwebbrowser submodule to fix keyboard issue
Added audio formats to mediaplayer's file filters.
Replace title, description and exclude files with one demos.xml
Change-Id: Ia7a617e728e25c53ab112c4e3dec0bac1996af42
Diffstat (limited to 'doc/images')
l--------- | doc/images/b2qt-demo-canvas3d-planets.jpg (renamed from doc/images/b2qt-demo-planets.jpg) | 0 | ||||
l--------- | doc/images/b2qt-demo-controls-touch.jpg | 1 | ||||
l--------- | doc/images/b2qt-demo-qt5-everywhere.jpg | 1 | ||||
l--------- | doc/images/b2qt-demo-qt5-particlesdemo.jpg | 1 | ||||
l--------- | doc/images/b2qt-demo-qtwebbrowser.jpg | 1 | ||||
l--------- | doc/images/b2qt-demo-sensorexplorer.jpg | 1 | ||||
l--------- | doc/images/b2qt-demo-sensors.jpg | 1 | ||||
l--------- | doc/images/b2qt-demo-webengine.jpg | 1 |
8 files changed, 1 insertions, 6 deletions
diff --git a/doc/images/b2qt-demo-planets.jpg b/doc/images/b2qt-demo-canvas3d-planets.jpg index 8c8b33e..8c8b33e 120000 --- a/doc/images/b2qt-demo-planets.jpg +++ b/doc/images/b2qt-demo-canvas3d-planets.jpg diff --git a/doc/images/b2qt-demo-controls-touch.jpg b/doc/images/b2qt-demo-controls-touch.jpg deleted file mode 120000 index bd78fcf..0000000 --- a/doc/images/b2qt-demo-controls-touch.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/controls-touch/preview_l.jpg
\ No newline at end of file diff --git a/doc/images/b2qt-demo-qt5-everywhere.jpg b/doc/images/b2qt-demo-qt5-everywhere.jpg deleted file mode 120000 index 0c61cdb..0000000 --- a/doc/images/b2qt-demo-qt5-everywhere.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/qt5-everywhere/preview_l.jpg
\ No newline at end of file diff --git a/doc/images/b2qt-demo-qt5-particlesdemo.jpg b/doc/images/b2qt-demo-qt5-particlesdemo.jpg deleted file mode 120000 index 42553b8..0000000 --- a/doc/images/b2qt-demo-qt5-particlesdemo.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/qt5-particlesdemo/preview_l.jpg
\ No newline at end of file diff --git a/doc/images/b2qt-demo-qtwebbrowser.jpg b/doc/images/b2qt-demo-qtwebbrowser.jpg new file mode 120000 index 0000000..13dea2f --- /dev/null +++ b/doc/images/b2qt-demo-qtwebbrowser.jpg @@ -0,0 +1 @@ +../../basicsuite/qtwebbrowser/preview_l.jpg
\ No newline at end of file diff --git a/doc/images/b2qt-demo-sensorexplorer.jpg b/doc/images/b2qt-demo-sensorexplorer.jpg deleted file mode 120000 index 4c2797f..0000000 --- a/doc/images/b2qt-demo-sensorexplorer.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/sensorexplorer/preview_l.jpg
\ No newline at end of file diff --git a/doc/images/b2qt-demo-sensors.jpg b/doc/images/b2qt-demo-sensors.jpg deleted file mode 120000 index 4144c1c..0000000 --- a/doc/images/b2qt-demo-sensors.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/sensors/preview_l.jpg
\ No newline at end of file diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg deleted file mode 120000 index 5d319d8..0000000 --- a/doc/images/b2qt-demo-webengine.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/webengine/preview_l.jpg
\ No newline at end of file |