diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/auto/corelib/tools/qbytearray/qbytearray.pro | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/auto/corelib/tools/qbytearray/qbytearray.pro')
-rw-r--r-- | tests/auto/corelib/tools/qbytearray/qbytearray.pro | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro new file mode 100644 index 0000000000..2c58db6b84 --- /dev/null +++ b/tests/auto/corelib/tools/qbytearray/qbytearray.pro @@ -0,0 +1,21 @@ +load(qttest_p4) +SOURCES += tst_qbytearray.cpp + + +QT = core core-private + +wince*|symbian { + addFile.files = rfc3252.txt + addFile.path = . + DEPLOYMENT += addFile +} + +wince* { + DEFINES += SRCDIR=\\\"./\\\" +} else:symbian { + TARGET.EPOCHEAPSIZE="0x100 0x800000" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" +} + +CONFIG += parallel_test |