diff options
author | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
commit | 1d8b7f41a5393f77eb3079513b083739edd90b91 (patch) | |
tree | 232e346dba7226f35af80043e072538dba473201 /tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro | |
parent | 624368f588e555f523fc507986bf3ec80681be48 (diff) | |
parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
download | Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.zip Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.gz Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro')
-rw-r--r-- | tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro b/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro new file mode 100644 index 0000000..fb8ecb0 --- /dev/null +++ b/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +SOURCES += tst_nativeimagehandleprovider.cpp +symbian { + LIBS += -lfbscli -lbitgdi + contains(QT_CONFIG, openvg): QT *= openvg +} |