diff options
| author | axis <qt-info@nokia.com> | 2009-07-06 07:36:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-07-06 07:45:27 (GMT) |
| commit | 01a1269d5f150b75e9f7571bc2a544494ffc3e17 (patch) | |
| tree | 8cc14e12bad6545dda51d027801e8c53fab06c6e | |
| parent | 8a9b84583d8b41124c867b7e5d462799345702d3 (diff) | |
| download | Qt-01a1269d5f150b75e9f7571bc2a544494ffc3e17.zip Qt-01a1269d5f150b75e9f7571bc2a544494ffc3e17.tar.gz Qt-01a1269d5f150b75e9f7571bc2a544494ffc3e17.tar.bz2 | |
Fixed warnings because of multiple macro definitions.
| -rw-r--r-- | src/qbase.pri | 2 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index e9de7f5..f2b35a8 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -141,7 +141,7 @@ unix:!symbian { } contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS +DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code 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 |