summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Doc: Bump version to 5.11.2Mikko Gronoff2018-06-282-6/+6
| | | | | | | | | | | | | | | Change-Id: I13ae5e9aed32e37aaa2f529d221c81506132046a Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Fix mediaplayer slider color definitionsJuho Annunen2018-06-182-3/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: I1d9547680adbed937ee3b5e413c9c2f76304af28 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
| * | Move info button to mediaplayer-demo footerJuho Annunen2018-06-182-13/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68674 Change-Id: I4e2c3dc499461dcbb9c4d6e8a03027d70419c160 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
| * | Fix mediaplayer color definitionsJuho Annunen2018-06-183-5/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68471 Change-Id: I292f40ce195f0e2f914353cb237e3009774c11bb Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Update Boot2Qt Launcher demo icons & doc imagesJuho Annunen2018-06-138-0/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68819 Change-Id: Idf1c1933765af2efc4e8193f5b03f99828cbc7b6 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Disable webbrowser demo from all imx7 boardsSamuli Piippo2018-05-311-1/+1
| | | | | | | | | | | | | | | Change-Id: I6acab41eddec0cc642b586dbb3e03b9334956893 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Doc: Bump version to 5.11.1Mikko Gronoff2018-05-252-6/+6
| | | | | | | | | | | | | | | Change-Id: I3cdbfee08f972a2082604cecc52a84e221ef83d5 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Doc: remove outdate doc folder under qtquickcontrols2 exampleTarja Sundqvist2018-05-244-61/+0
| | | | | | | | | | | | | | | | | | | | | | | | basicsuite/qtquickcontrol2 directory has /doc folder that seems to contain some outdated content that is not used at all. Change-Id: Ib11cf99f3f22c217b1c73b0470f6f6a43bf03346 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | doc: add missing doc images for e-bike & quickcontrols2 demoMikko Gronoff2018-05-242-0/+0
| | | | | | | | | | | | | | | Change-Id: I966708859b17d2f8ba613db12747bd55f508faff Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Update Boot2Qt demos appearing in QtCreatorMikko Gronoff2018-05-232-95/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New demos: E-Bike, Quick Controls 2 Gallery Removed demos: About B2Qt, Cinematic Demo, Camera, Data visualization, Canvas3D, Dashboard, Controls Gallery & Flat controls. Task-number: QTBUG-67917 Change-Id: I562737e7fd3e851e8a84cb3b71acc939a216032f Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Enable ebike demoSami Nurmenniemi2018-05-2317-2/+1479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added datacollector, which is generates mock data to the demo. It needs to be configured to run as a service or manually started before running the demo. Without running datacollector, the demo does not show any changing data. Task-number: QTBUG-67917 Change-Id: Ia113b76b5eb024353051b93d9d518211ee2cd601 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Temporarily disable e-bike from the basicsuite demo setSami Nurmenniemi2018-05-211-0/+2
| | | | | | | | | | | | | | | Change-Id: Ia75480ce0624921683459cba68b1efaedbd61cfb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Fix Media Player demo color definitionsSami Nurmenniemi2018-05-186-8/+11
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: I2bd15e2e873aa7343a072b846918296e7cbce205 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Fix paths for demos.xmlSami Nurmenniemi2018-05-181-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-67917 Change-Id: Ibb1b64aaa110a62f2b28dee6fa21f3bc665e364f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Add new Ebike demo to basicsuiteJuho Annunen2018-05-07151-0/+13001
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-67917 Change-Id: I88e783ff7bcc530b13edfd3e21565953433293dc Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Move common definitions to shared settingsJuho Annunen2018-05-0732-76/+152
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65302 Change-Id: I2153e2f2b4aa295e87098256354ed034480294df Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Update QtWebBrowser demo to new UI themeJuho Annunen2018-05-0771-0/+4625
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62793 Change-Id: I8e1a0dcb229dc1b445a1b3a7787e6b818f246249 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Remove qtwebbrowser submoduleJuho Annunen2018-05-072-4/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62793 Change-Id: I3ef7323ebaed7b16014e139a5110f1784240520a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Replace existing controls demos with controls 2 gallery exampleJuho Annunen2018-05-0464-2/+3062
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62805 Change-Id: If63369430adffa875b0e96a148a03ab908a1dea2 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Update Mediaplayer demo to new UI themeJuho Annunen2018-05-0437-310/+300
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: Id7cb520669fc696cec65da591414b045fe45754a Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Update GraphicalEffects demo to new UI themeJuho Annunen2018-05-041-21/+12
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62790 Change-Id: Ie4953d8ca1209ed382ad82f1db35c3b1a997dd1d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Add new fontsJuho Annunen2018-05-0414-1/+37
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65302 Change-Id: I9ec2e7f5f904aa148aa29048ccbb84060e1bb3f1 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Update Charts demo to new UI themeJuho Annunen2018-05-0416-107/+228
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62792 Change-Id: I95c6fb038f5d427da2ed1ee6698e1afcfa436eee Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Comment out 7 demos from demos.xml fileJuho Annunen2018-05-041-0/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62794 Change-Id: Ib3afd9df51b7adad359d80407566a24cee9e1366 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Doc: Bump version to 5.11.0Mikko Gronoff2018-02-192-6/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-66307 Change-Id: Ica4191efa5adf0396d0be0ac980e583734d0045c Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | | add 3d alexa knx demoAndrew O'Doherty2018-05-31138-0/+5502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The knx-demo directory needs to be divided into two sub-directories containing the alexa 3D demo and the 2d demo. Very large files used by the 3d demo are stored in https://git-lfs.qt.io/Gerrit/boot2qt-demos.git Change-Id: I55e4210e93fc9e017d85e163f13c0b04de96cff0 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Add Qt KNX tradeshow demo applicationKarsten Heimrich2018-04-2648-0/+2838
|/ / | | | | | | | | | | | | | | Move from: http://code.qt.io/cgit/qt/qtknx.git/ Change-Id: I92de81ebb1505fe8c8349300321606ec7b2ea120 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2018-02-127-8/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: Doc: Bump version to 5.10.1 iot-sensortag: Add an About tab iot-sensortag: Fix build against 5.10.0 iot-sensortag: Create a quit button SmartWatch demo Change-Id: I247db054b05cb481c67b08cd42fb762f5539460c
| * | Doc: Bump version to 5.10.15.10Mikko Gronoff2018-01-252-7/+7
| | | | | | | | | | | | | | | Change-Id: I5e2c5e2003744f1e46a38953720316cdc0da6e66 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | iot-sensortag: Add an About tabMaurice Kalinowski2017-12-183-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the watch UI it is helpful to provide an About to visualize it is a Qt application. Change-Id: I83779c038dcaac12ca873b53f4d82d0e801233f2 Reviewed-by: Andrew O'Doherty <andrew.odoherty@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | iot-sensortag: Fix build against 5.10.0Maurice Kalinowski2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before the final release the Qt Mqtt API has been updated. Change-Id: I6f9e3e9cc5db16fe87d3493f12703194e9f14654 Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | iot-sensortag: Create a quit button SmartWatch demoAndrew O'Doherty2017-11-232-0/+14
| | | | | | | | | | | | | | | | | | | | | SmartWatch demo requires a button to exit the application Change-Id: I64f366d70960e868bcf9f4c644f81a145edd44b6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | democompositor: Use == to compare the appEntry and not ===Holger Hans Peter Freyther2017-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The empty/invalid QVariant is not an identity for nil. Use the equality operator instead. Change-Id: Idec99cdc7cefb0fef1c2e3edb2ff3183b272c281 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Introduce a graceful stop of a client applicationHolger Hans Peter Freyther2017-11-293-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SIGTERM to terminate the application but to make sure it will go away create a unique timer and start it. The timer is owned by the QProcess and will go away once the process has terminated. On timeout use SIGKILL to make sure the process is going away. Change-Id: I9f9617a579952697aa61bd7bfa1d2fd264a443ce Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Allow to stop running processes by AppEntryHolger Hans Peter Freyther2017-11-293-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Kill all processes that were started with the same AppEntry. It is using SIGKILL to make sure that the process is going away and going away quickly. Change-Id: I4d2bf2cf7fb35c34636640562c04e4bd528bed63 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Export the sourceFileName as wellHolger Hans Peter Freyther2017-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This will allow to easily compare two different AppEntry. The easiest way is to check if they come from the same file. Change-Id: I2642b1037eeb3abd77f4b2d677753ccd01256075 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2112-18/+389
|\ \ \ | |/ / | | | | | | Change-Id: I08eb1b887d7b8cfaae3e105d176136886682c865
| * | Disable camera demo for jetson-tx1Samuli Piippo2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I42ea53fbdbe045f75ee8b5b51ef12a2aa027eca0 Task-number: QTBUG-61714 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | iot-sensortag: Adapt demo to the screen size of a smartwatchAndrew O'Doherty2017-11-1510-7/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | mainSmall.qml requires a SwipeView since the smartwatch screen is too small too display all the charts. The charts have been scaled to smaller size and some alignment adjustments have been made Change-Id: I229b6150135c8a1a65bc8114f430904a15397b1e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Fix issue where mediaplayer initially displays black videoSami Nurmenniemi2017-10-251-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If effectLoader.item has not been set before effectSource changes, setting effectLoader geography fails. There was a workaround where changing effect caused the video to display correctly. Task-number: QTBUG-63091 Change-Id: I726068f0860269d94507be5f92947caa6716efdf Reviewed-by: Kari Hormi <kari.hormi@qt.io>
| * | iot-sensortag: Make any cloud backend optionalMaurice Kalinowski2017-10-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, either the MQTT or Azure backend was enabled. But there are users who prefer to have a pure local build. Hence UPDATE_TO_AZURE is an optional setting now. Change-Id: Ie1ff8b6eaa1c357f83a971bd2ded59d40f2c2eb0 Reviewed-by: Shrikant Dhumal <shrikant.dhumal@qt.io>
| * | iot-sensortag: Specify package source locationMaurice Kalinowski2017-10-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the build system to use the manual manifest file and is a regression of the UI clean up changes. Change-Id: Ib3ece60c01f1055b7104defbd9752af534bf52ac Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | democompositor: Store the AppEntry in the ChromeHolger Hans Peter Freyther2017-11-093-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the AppEntry in the Chrome and set it when a new surface is created. Handle the situation when an external application is launched and check for null. Change-Id: Ib327ec266587bba9a2c48eacbcb79c508b2066d0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | processlauncher: Fix crashing on destruction with running appsHolger Hans Peter Freyther2017-11-092-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The democompositor would crash because the QProcess will be deleted from within ~QObject and then emit a signal which will access the partially destructed WaylandProcessLauncher. Iterate through the list and disconnect the slots and then delete the QProcess before the ~QObject is ran. An alternative would be to iterate the m_appStates and just block the signals of the QProcess. This might be more future proof (e.g. another signal being connected) but can impact other signal/slot connections as well. Change-Id: Id6c19dbe0c3070a131b28365584f06fb7c6014b3 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Add a mandatory "Id" to the app specificationHolger Hans Peter Freyther2017-11-0911-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | Add a manodatory appId, expose it to QML, add a simple find by id method and update the testcases. Change-Id: I4f80a97e5f31e972694dd61eff0166f9de2f5d51 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Allow arbitrary extensions inside the app mapHolger Hans Peter Freyther2017-10-246-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow extensions and let them begin with X-. Briefly document it, add some extensions as an example and briefly test that the right values are parsed. Change-Id: I7a9ae6b2f365802fcce6dce56fa7795f76d83421 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Move images and apps to resources/ folderHolger Hans Peter Freyther2017-10-2422-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The apps were hard to be discovered inside apps/files and other projects here seem to use a resources/ folder. Move the apps and the images in it. Change-Id: If2e9127ea6e941e1a97465b2de5e9f9af3660ea3 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | democompositor: Remove deleted files from the modelHolger Hans Peter Freyther2017-10-243-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the previous code review Paul discovered the fact that files would never be removed. Implement finding deleted files and emit a signal per removed file. Consume the signal in QML and use the new API to kill the process (one could close the wayland display connection as well). Emit the removed signals _after_ the model has been updated to provide the QML code with an updated model during the signal handling. Change-Id: Ib3bb1bd953bfbf09d25c5e5822756a53b08fd797 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2017-10-1173-1111/+1534
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: iot-sensortag: Add Uuid fallback for device id iot-sensortag: Use double-click to select connection iot-sensortag: Add logging window iot-sensortag: Do not enable MQTT by default Merge remote-tracking branch 'origin/5.9' into 5.10 iot-sensortag: Disable dateview in portrait mode iot-sensortag: Show fullscreen on Android iot-sensortag: Align font sizes iot-sensortag: Add support for MQTT iot-sensortag: Redesign of example Fix typo Doc: Bump version to 5.10.0 Doc: Bump version to 5.9.2 Change-Id: Id006d6911a42db2a493f7b3f0eb891c791a5879c
| * | iot-sensortag: Add Uuid fallback for device idMaurice Kalinowski2017-10-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | All Android test devices report localhost as hostname. That causes the remote display to not show any other android device, but also have multiple localhost devices report data. Change-Id: I144800d876faf35bc9ff8e526be31d9c322032dc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>