diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 12:05:57 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 12:05:57 (GMT) |
commit | d7666889000a80d88eb56c44d7ed83c8957fc767 (patch) | |
tree | 47a8195649520d45f75c0497021ad35841e6d073 /examples/touch/fingerpaint/fingerpaint.pro | |
parent | 29a6377c6539840ca901bdcb045a42b7832ac98a (diff) | |
parent | 4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf (diff) | |
download | Qt-d7666889000a80d88eb56c44d7ed83c8957fc767.zip Qt-d7666889000a80d88eb56c44d7ed83c8957fc767.tar.gz Qt-d7666889000a80d88eb56c44d7ed83c8957fc767.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
Diffstat (limited to 'examples/touch/fingerpaint/fingerpaint.pro')
-rw-r--r-- | examples/touch/fingerpaint/fingerpaint.pro | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro new file mode 100644 index 0000000..f1c9d4c --- /dev/null +++ b/examples/touch/fingerpaint/fingerpaint.pro @@ -0,0 +1,11 @@ +HEADERS = mainwindow.h \ + scribblearea.h +SOURCES = main.cpp \ + mainwindow.cpp \ + scribblearea.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint +INSTALLS += target sources |