diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 03:43:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 03:43:35 (GMT) |
| commit | 19bf1fec0ec3341fae97e27d3cb0baf8fb27b9f3 (patch) | |
| tree | 16d04a9a1d3f87f6e42d94c8ea85875dfa2b5809 /demos/qtdemo/xml/examples.xml | |
| parent | 379b4dc81177b95c15de30c5925efca1136e4041 (diff) | |
| parent | 91a1f7a1c408052b1d284d6b901819964e338fe5 (diff) | |
| download | Qt-19bf1fec0ec3341fae97e27d3cb0baf8fb27b9f3.zip Qt-19bf1fec0ec3341fae97e27d3cb0baf8fb27b9f3.tar.gz Qt-19bf1fec0ec3341fae97e27d3cb0baf8fb27b9f3.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
Diffstat (limited to 'demos/qtdemo/xml/examples.xml')
| -rw-r--r-- | demos/qtdemo/xml/examples.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index e3240ab..9121861 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -19,6 +19,7 @@ <example filename="qmediaplayer" name="Media Player" /> <example filename="boxes" name="Boxes" /> <example filename="sub-attaq" name="Sub-attaq" /> + <example filename="spectrum" name="Spectrum Analyzer" /> </demos> <category dirname="animation" name="Animation Framework"> <example filename="animatedtiles" name="Animated Tiles" /> |