diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /tests/manual/lance/lance.pro | |
parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'tests/manual/lance/lance.pro')
-rw-r--r-- | tests/manual/lance/lance.pro | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro new file mode 100644 index 0000000000..a3fa27f77f --- /dev/null +++ b/tests/manual/lance/lance.pro @@ -0,0 +1,26 @@ +LANCELOT_DIR = $$PWD/../../auto/lancelot +CONFIG+=console moc +TEMPLATE = app +INCLUDEPATH += . $$LANCELOT_DIR +QT += core-private gui-private + +# Input +HEADERS += widgets.h \ + interactivewidget.h \ + $$LANCELOT_DIR/paintcommands.h +SOURCES += interactivewidget.cpp \ + main.cpp \ + $$LANCELOT_DIR/paintcommands.cpp +RESOURCES += icons.qrc \ + $$LANCELOT_DIR/images.qrc + +contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl + +symbian*: { + testData.files = $$QT_BUILD_TREE/tests/auto/lancelot/scripts + testData.path = . + DEPLOYMENT += testData +} + + + |