diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
| commit | 18a3f6169bb8a763366003d92b8013950578c79f (patch) | |
| tree | e39fa00a9511410fea9be35a6130007e43719ad8 /examples/painting/composition/composition.pro | |
| parent | 371d398f70e10408e0eaba7b5f05e638a0048599 (diff) | |
| parent | a06c8405d053b16327d65415f3335eceb37abd3b (diff) | |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
demos/demos.pro
demos/embedded/digiflip/digiflip.pro
examples/examples.pro
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
src/gui/kernel/qplatformglcontext_qpa.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
Diffstat (limited to 'examples/painting/composition/composition.pro')
| -rw-r--r-- | examples/painting/composition/composition.pro | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro new file mode 100644 index 0000000000..00c500ea3b --- /dev/null +++ b/examples/painting/composition/composition.pro @@ -0,0 +1,29 @@ +SOURCES += main.cpp composition.cpp +HEADERS += composition.h + +SHARED_FOLDER = ../shared + +include($$SHARED_FOLDER/shared.pri) + +RESOURCES += composition.qrc +contains(QT_CONFIG, opengl) { + DEFINES += QT_OPENGL_SUPPORT + QT += opengl widgets +} + +# install +target.path = $$[QT_INSTALL_DEMOS]/qtbase/composition +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html +sources.path = $$[QT_INSTALL_DEMOS]/qtbase/composition +INSTALLS += target sources + +symbian: CONFIG += qt_demo + +win32-msvc* { + QMAKE_CXXFLAGS += /Zm500 + QMAKE_CFLAGS += /Zm500 +} + +wince* { + DEPLOYMENT_PLUGIN += qjpeg +} |