summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-11 17:28:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:46:00 +0200
commitc595988a5841deaf04aaac61b5354c120b9e4b0f (patch)
treea8821f847c33018dcbea3e4e75bc30d7150b3b4b /src/testlib
parent0f548b1744e2ee296c9072e9327b05dd7cd8c2f8 (diff)
automatically add QT_BUILD_FOO_LIB to DEFINES
Change-Id: I35d9861e48469eb5cc8824e361450684047e6559 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtest_global.h2
-rw-r--r--src/testlib/testlib.pro1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h
index b567fe7c00..18d09ba162 100644
--- a/src/testlib/qtest_global.h
+++ b/src/testlib/qtest_global.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
#if !defined(QT_SHARED) && !defined(QT_DLL)
# define Q_TESTLIB_EXPORT
#else
-# ifdef QTESTLIB_MAKEDLL
+# ifdef QT_BUILD_TESTLIB_LIB
# define Q_TESTLIB_EXPORT Q_DECL_EXPORT
# else
# define Q_TESTLIB_EXPORT Q_DECL_IMPORT
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 1d1849d406..8016680952 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -58,7 +58,6 @@ SOURCES = qtestcase.cpp \
qxunittestlogger.cpp
DEFINES *= QT_NO_CAST_TO_ASCII \
QT_NO_CAST_FROM_ASCII \
- QTESTLIB_MAKEDLL \
QT_NO_DATASTREAM
embedded:QMAKE_CXXFLAGS += -fno-rtti
wince*::LIBS += libcmt.lib \