diff options
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtest_global.h | 2 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 10 |
2 files changed, 4 insertions, 8 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 1a76a3b556..f77a611e25 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -1,11 +1,10 @@ -load(qt_module) +load(qt_build_config) TARGET = QtTest -QPRO_PWD = $$PWD QT = core-private +CONFIG += exceptions -CONFIG += module exceptions -MODULE_PRI = ../modules/qt_testlib.pri +MODULE_CONFIG = console testlib_defines INCLUDEPATH += . unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ @@ -59,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 \ @@ -83,8 +81,6 @@ mac { load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/testlib/qttestversion.h - QMAKE_TARGET_PRODUCT = QTestLib QMAKE_TARGET_DESCRIPTION = Qt \ Unit \ |