summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-07-06 07:36:23 (GMT)
committeraxis <qt-info@nokia.com>2009-07-06 07:45:27 (GMT)
commit01a1269d5f150b75e9f7571bc2a544494ffc3e17 (patch)
tree8cc14e12bad6545dda51d027801e8c53fab06c6e /src/testlib
parent8a9b84583d8b41124c867b7e5d462799345702d3 (diff)
downloadQt-01a1269d5f150b75e9f7571bc2a544494ffc3e17.zip
Qt-01a1269d5f150b75e9f7571bc2a544494ffc3e17.tar.gz
Qt-01a1269d5f150b75e9f7571bc2a544494ffc3e17.tar.bz2
Fixed warnings because of multiple macro definitions.
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/testlib.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index de42b6d..ec9a52f 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -12,7 +12,7 @@ unix:!embedded {
HEADERS = qtest_global.h qtestcase.h qtestdata.h qtesteventloop.h
SOURCES = qtestcase.cpp qtestlog.cpp qtesttable.cpp qtestdata.cpp qtestresult.cpp qasciikey.cpp qplaintestlogger.cpp qxmltestlogger.cpp qsignaldumper.cpp qabstracttestlogger.cpp qbenchmark.cpp qbenchmarkmeasurement.cpp qbenchmarkvalgrind.cpp qbenchmarkevent.cpp
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QTESTLIB_MAKEDLL QT_NO_DATASTREAM
+DEFINES *= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QTESTLIB_MAKEDLL QT_NO_DATASTREAM
wince*:{
LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib