diff options
| author | axis <qt-info@nokia.com> | 2009-06-02 10:14:04 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-02 10:14:04 +0200 |
| commit | 3c594257c4aedf113de92c5888e74f676ba87385 (patch) | |
| tree | e309c7502e13f552203b509494a20792125fed29 /examples/qtconcurrent | |
| parent | 539989f41316329e7aba69ba97e1579eed6036e6 (diff) | |
| parent | 0ff7b68f2e3f184d809cf6fd13ff930efa493e9f (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
Diffstat (limited to 'examples/qtconcurrent')
| -rw-r--r-- | examples/qtconcurrent/imagescaling/imagescaling.pro | 2 | ||||
| -rw-r--r-- | examples/qtconcurrent/qtconcurrent.pro | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index 2040e7c5cf..180571ca91 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -13,3 +13,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling INSTALLS += target sources include($$QT_SOURCE_TREE/examples/examplebase.pri) + +wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index b21cb17c45..a30c0bd536 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -1,10 +1,13 @@ TEMPLATE = subdirs SUBDIRS = imagescaling \ map \ - progressdialog \ runfunction \ wordcount +!wince* { + SUBDIRS += progressdialog +} + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README |