diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
| commit | 49c5acd406f5d2607b7a66d38d6279aa8c78f7f9 (patch) | |
| tree | f45126f94631d128a05817e8179ebbaaa607df60 /examples/graphicsview/graphicsview.pro | |
| parent | a44894a39113e0eb9d4f7c912eee4671b3f391c1 (diff) | |
| parent | 8280ed177d798aeaf82868ba6c7c8c4250051f1d (diff) | |
| download | Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.zip Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.gz Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/graphicsview/graphicsview.pro
Diffstat (limited to 'examples/graphicsview/graphicsview.pro')
| -rw-r--r-- | examples/graphicsview/graphicsview.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index e955725..daf7cc0 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -8,7 +8,8 @@ SUBDIRS = \ !symbian: SUBDIRS += \ diagramscene \ dragdroprobot \ - basicgraphicslayouts + basicgraphicslayouts \ + anchorlayout contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot |