summaryrefslogtreecommitdiffstats
path: root/examples/declarative/declarative.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-06-24 09:52:41 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-06-24 09:52:41 (GMT)
commitcf2f72f4f61f3a9e0e7573379c33bb341eeba7be (patch)
tree06fbd459f62f87344e7db973a0a9f3050cece825 /examples/declarative/declarative.pro
parent164728f711136356a6c3482f762321b01c9d82dd (diff)
parent705b0f958a6071341b10cbd51917e1378356491b (diff)
downloadQt-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.zip
Qt-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.tar.gz
Qt-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
Diffstat (limited to 'examples/declarative/declarative.pro')
-rw-r--r--examples/declarative/declarative.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index e3d922c..f10e7a4 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -6,6 +6,9 @@ SUBDIRS = \
modelviews \
tutorials
+# OpenGL shader examples requires opengl and they contain some C++ and need to be built
+contains(QT_CONFIG, opengl): SUBDIRS += shadereffects
+
# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name
symbian:SUBDIRS -= plugins