diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:03:35 +0200 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:04:13 +0200 |
| commit | b1f9ebae32c44ff0dc2315a1c1c363ad98aaf145 (patch) | |
| tree | bad33c0a01cc4274dee43c8370a0bdcd08d6fc7f /basicsuite/Qt5 Launch Presentation/description.txt | |
| parent | 9c48ce0535c7a89e32a4b0f932dc3f61e973018a (diff) | |
| parent | 0325d7b4156098ef064f04208905712c5bf0174e (diff) | |
Merge branch 'stable' into release
* stable: (50 commits)
Fix deployment of QML import plugins when building in Qt Creator
Add QtWidgets dependecy to shared.pri
Update title and description for Text Input demo
Update content for About Boot to Qt demo
Fix QML GroupBox: Binding loop detected for property
[controls-touch] Deploy images
Remove Sensors demo from the Qt Creator's list of examples
Remove Sensor Explorer and Particles demos from launcher
Fix layout issues with Qt-Everywhere (touchgallery)
[qt5-launchpresentation] Don't crop the description text on nexus
[launcher settings] improve visual appearance
[qt5-everywhere] update preview image
Fix vkb import path
Fix issues in qt5-launcher presentation
Remove Raspberry Pi logo from demo
Fix Canvas2D error
Qt5-Everywhere: show network error message
fix glsl syntax in graphical effects demo
Update copyright year
Limit camera & mediaplayer demos to working devices
...
Change-Id: I1ed9233a89ea989013b398c8480e1932949fff19
Diffstat (limited to 'basicsuite/Qt5 Launch Presentation/description.txt')
| -rw-r--r-- | basicsuite/Qt5 Launch Presentation/description.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/basicsuite/Qt5 Launch Presentation/description.txt b/basicsuite/Qt5 Launch Presentation/description.txt deleted file mode 100644 index 48d03f3..0000000 --- a/basicsuite/Qt5 Launch Presentation/description.txt +++ /dev/null @@ -1,6 +0,0 @@ -The following is a quick tour of what is new in Qt 5. - -It is an application written with Qt Quick, based on Qt 5. The source code is available from: https://qt.gitorious.org/qt-labs/qt5-launch-demo -The demo makes use of the QML Presentation System, available from: ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git - -The demo has been modified slightly to run in this launcher. |