diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
| commit | e4dc3567af533df2e57425952c4609726515d2cd (patch) | |
| tree | 72824b5efc9a4d6ed9f099d34404076245e164fa /examples/declarative/declarative.pro | |
| parent | a36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff) | |
| parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
| download | Qt-e4dc3567af533df2e57425952c4609726515d2cd.zip Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'examples/declarative/declarative.pro')
| -rw-r--r-- | examples/declarative/declarative.pro | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index e37c3d4..e3d922c 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -2,51 +2,28 @@ TEMPLATE = subdirs # These examples contain some C++ and need to be built SUBDIRS = \ - extending \ - imageprovider \ - objectlistmodel \ - stringlistmodel \ - plugins \ - proxywidgets + cppextensions \ + modelviews \ + tutorials # plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name symbian:SUBDIRS -= plugins # These examples contain no C++ and can simply be copied sources.files = \ - animations \ - aspectratio \ - behaviors \ - border-image \ - clocks \ - connections \ - dial \ - dynamic \ - effects \ - fillmode \ - focus \ - fonts \ - gridview \ - layouts \ - listview \ - mousearea \ - package \ - parallax \ - progressbar \ - scrollbar \ - searchbox \ - slideswitch \ - sql \ - states \ - tabwidget \ - tic-tac-toe \ - tutorials \ - tvtennis \ - velocity \ - webview \ - workerlistmodel \ - workerscript \ - xmldata \ - xmlhttprequest + animation \ + cppextensions \ + i18n \ + imageelements \ + keyinteraction \ + positioners \ + sqllocalstorage \ + text \ + threading \ + touchinteraction \ + toys \ + ui-components \ + xml + sources.path = $$[QT_INSTALL_EXAMPLES]/declarative INSTALLS += sources |