diff options
| author | dac <qt-info@nokia.com> | 2010-08-04 13:59:41 +1000 |
|---|---|---|
| committer | dac <qt-info@nokia.com> | 2010-08-04 13:59:41 +1000 |
| commit | 0d66d5a870c06a3a5502b89a1c771c714e108049 (patch) | |
| tree | f6415cbcf4bfaef038814059e5c1a2e3bb246b01 | |
| parent | 66fcf566f68dcb5dfe058200543448fbc7636cbe (diff) | |
Get QtUiTest building on Windows again.
| -rw-r--r-- | coreplugin/coreplugin.pro | 3 | ||||
| -rw-r--r-- | libqsystemtest/libqsystemtest.pro | 2 | ||||
| -rw-r--r-- | libqsystemtest/qtestprotocol_p.h | 3 | ||||
| -rw-r--r-- | libqsystemtest/qtestremote_p.h | 2 | ||||
| -rw-r--r-- | libqtuitest/libqtuitest.pri | 13 |
5 files changed, 15 insertions, 8 deletions
diff --git a/coreplugin/coreplugin.pro b/coreplugin/coreplugin.pro index d847cc3..415bc3b 100644 --- a/coreplugin/coreplugin.pro +++ b/coreplugin/coreplugin.pro @@ -1,9 +1,10 @@ TEMPLATE = lib TARGET = Core DESTDIR = $$BUILDROOT/lib -CONFIG += static +QT += network INCLUDEPATH += .. ../botan/build LIBS+=-L$$BUILDROOT/lib -lBotan +DEFINES+=CORE_LIBRARY HEADERS +=\ ssh/sftpchannel.h \ diff --git a/libqsystemtest/libqsystemtest.pro b/libqsystemtest/libqsystemtest.pro index c267d98..cbc59fb 100644 --- a/libqsystemtest/libqsystemtest.pro +++ b/libqsystemtest/libqsystemtest.pro @@ -49,7 +49,7 @@ TEMPLATE=lib TARGET=qsystemtest TARGET=$$qtLibraryTarget($$TARGET) HEADERS*=$$SEMI_PRIVATE_HEADERS $$PRIVATE_HEADERS -CONFIG+=qtestlib staticlib +CONFIG+=qtestlib QT+=network script LIBS+=-L$$BUILDROOT/lib -lBotan -lCore diff --git a/libqsystemtest/qtestprotocol_p.h b/libqsystemtest/qtestprotocol_p.h index d2c2dc3..0fcd582 100644 --- a/libqsystemtest/qtestprotocol_p.h +++ b/libqsystemtest/qtestprotocol_p.h @@ -51,10 +51,11 @@ #include <QtNetwork/QTcpSocket> #include <QtNetwork/QTcpServer> #include <QtCore/QElapsedTimer> +#include "qtuitestglobal.h" #define REMOTE_CONNECT_ERROR 99 -class QTestMessage +class QSYSTEMTEST_EXPORT QTestMessage { public: QTestMessage(QString const &event = QString(), QVariantMap const &map = QVariantMap() ); diff --git a/libqsystemtest/qtestremote_p.h b/libqsystemtest/qtestremote_p.h index 0acec07..4d732a6 100644 --- a/libqsystemtest/qtestremote_p.h +++ b/libqsystemtest/qtestremote_p.h @@ -43,7 +43,7 @@ #define QTESTREMOTE_P_H #include "qtestprotocol_p.h" -#include <qtuitestglobal.h> +#include "qtuitestglobal.h" class QString; diff --git a/libqtuitest/libqtuitest.pri b/libqtuitest/libqtuitest.pri index 508e94c..5d52454 100644 --- a/libqtuitest/libqtuitest.pri +++ b/libqtuitest/libqtuitest.pri @@ -2,13 +2,18 @@ INCLUDEPATH += $$SRCROOT/libqtuitest symbian { LIBS+=-L$$OUT_PWD/ -lqtuitest -} else mac { +} + +mac { CONFIG(debug,debug|release): LIBS += -L$$BUILDROOT/lib -lqtuitest_debug CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqtuitest -} else win32 { -# LIBS+=$$OUT_PWD/../../lib/qtuitest.lib +} + +win32 { CONFIG(debug,debug|release): LIBS+= -L$$BUILDROOT/libqtuitest -lqtuitestd CONFIG(release,debug|release):LIBS+= -L$$BUILDROOT/libqtuitest -lqtuitest -} else { +} + +unix:!symbian { LIBS += -L$$BUILDROOT/lib -lqtuitest } |