summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo/qtdemo.pro
Commit message (Collapse)AuthorAgeFilesLines
* Without Declarative, still build and run QtDemoAlan Alpert2010-08-191-1/+5
| | | | | | | If declarative is configured out then QtDemo will now still build, with all declarative demos disabled. Task-number: QTBUG-12983
* There where still references to the old Assistant.kh12010-06-231-1/+1
| | | | Task-number: QTBUG-11651
* Tweak aesthetics of QML viewer inside QtDemoAlan Alpert2010-05-271-2/+1
| | | | | Make the UX more controlled from QML, and tweak the frame to be better. Blur mechanism has been reworked, but still disabled by default.
* Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-241-1/+4
| | | | | | | | | | | | | Includes minor changes and additions to the existing doc and examples, so that they follow Qt conventions better. Note that while blurring the background was part of the plan for the embedded QML viewer I could not get it to perform well enough. In the future, when blur is fast enough (or someone else can get it to perform better than I) -use-blur should become the default, and -no-blur the option. Task-number: QTBUG-10582
* Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-2/+0
| | | | | | | This prevent debug and release object file to be mixed up when linking these application in a debug_and_release configured Qt. Reviewed-by: Marius Storm-Olsen
* Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-211-1/+3
| | | | | | | | | 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' into 4.6-stableJason Barron2009-06-251-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * BT: Fixes building qtdemo in the installed tree of sources.Thomas Zander2009-06-101-1/+3
| | | | | | | | | | | | | | The QT_BUILD_TREE variable only works in the source or build dir, but fails in the demo which *install* the sources that should be buildable too. Reviewed-by: Marius Storm-Olsen
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+72
|
* Long live Qt for S60!axis2009-04-241-0/+74