summaryrefslogtreecommitdiffstats
path: root/demos/demos.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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