summaryrefslogtreecommitdiffstats
path: root/demos/demos.pro
Commit message (Collapse)AuthorAgeFilesLines
* Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-011-6/+3
| | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen
* Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
|
* Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-031-1/+11
| | | | Reviewed-by: David Boddie
* Do not include Spectrum Analyzer demo in static buildsGareth Stockwell2010-08-111-1/+1
| | | | | | | | | This demo includes a 3rd party library which is licensed under the LGPL. As such, the demo application may only link to the library dynamically. Task-number: QTBUG-12713 Reviewed-by: Justin McPherson
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-191-2/+0
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
| * Removed mediaservices.Kurt Korbatits2010-05-181-2/+0
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * Add spectrum analyzer demo appGareth Stockwell2010-05-051-0/+2
| | | | | | | | | | | | | | | | | | This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis. Reviewed-by: Alessandro Portale
* | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | Fixed declarative demos not being installed.Rohan McGovern2010-03-081-0/+2
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJustin McPherson2010-02-051-1/+1
| |\ \
| * | | Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-151-0/+2
| | |/ | |/|
* | | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-231-1/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-1/+1
|/ | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* Removed the chip demo for windows CEninerider2009-12-141-2/+19
| | | | | | | | The chip demo causes a memory exception on most Windows CE devices. For now we simply will not include this demo in the package for Windows CE. In the future a specialized version might be created. Reviewed-by: Maurice
* Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila
* Build the embedded demos on X11 so they can be used by MaemoTom Cooksey2009-10-141-1/+1
|
* Symbian fix: rename examples ftp and musicplayer to start with q.Frans Englich2009-10-091-1/+1
| | | | | | | | | | | | | | | | Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich
* Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-211-1/+1
| | | | | | | | | demobase.pri sounded to generic, also I changed it to error on !symbian platforms, and test all the places we include it. That makes it more obvious when reading the .pro files that this is actually Symbian spesific stuff, not cross-platform Qt rules. Reviewed-by: axis
* Merge commit 'qt/master-stable'Jason Barron2009-07-301-1/+3
|\ | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * Move sub-attaq from examples to demos because sub-attaq is a bitAlexis Menard2009-07-281-1/+3
| | | | | | | | too "advanced".
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| * Fix syntax error in demos.pro.Jason McDonald2009-05-151-1/+1
| | | | | | | | Reviewed-by: Lincoln Ramsay
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+73
|
* Long live Qt for S60!axis2009-04-241-0/+80