From 5ea35723680f604aa4e63630cf598f2b57094e65 Mon Sep 17 00:00:00 2001 From: "S. Razi Alavizadeh" Date: Sat, 8 Jun 2013 23:33:49 +0430 Subject: [PATCH] [Windows][Tests] Fixed compile issues on Windows. --- src/lib/adblock/adblockrule.h | 2 +- src/lib/autofill/pageformcompleter.h | 2 +- .../passwordbackends/databasepasswordbackend.h | 3 ++- src/lib/autofill/passwordbackends/passwordbackend.h | 3 ++- src/lib/network/pac/proxyautoconfig.h | 4 +++- src/lib/other/updater.h | 2 +- tests/autotests/autotests.pro | 3 ++- tests/autotests/main.cpp | 2 ++ tests/autotests/passwordbackendtest.cpp | 10 ++++++++++ tests/autotests/passwordbackendtest.h | 2 ++ 10 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/lib/adblock/adblockrule.h b/src/lib/adblock/adblockrule.h index 01681e4c4..5ea2c952d 100644 --- a/src/lib/adblock/adblockrule.h +++ b/src/lib/adblock/adblockrule.h @@ -57,7 +57,7 @@ class QUrl; class AdBlockSubscription; -class AdBlockRule +class QT_QUPZILLA_EXPORT AdBlockRule { public: AdBlockRule(const QString &filter = QString(), AdBlockSubscription* subscription = 0); diff --git a/src/lib/autofill/pageformcompleter.h b/src/lib/autofill/pageformcompleter.h index 135ebddaf..f20292e0a 100644 --- a/src/lib/autofill/pageformcompleter.h +++ b/src/lib/autofill/pageformcompleter.h @@ -38,7 +38,7 @@ struct PageFormData { } }; -class PageFormCompleter +class QT_QUPZILLA_EXPORT PageFormCompleter { public: explicit PageFormCompleter(QWebPage* page); diff --git a/src/lib/autofill/passwordbackends/databasepasswordbackend.h b/src/lib/autofill/passwordbackends/databasepasswordbackend.h index d79ffaf5a..110dc7112 100644 --- a/src/lib/autofill/passwordbackends/databasepasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databasepasswordbackend.h @@ -19,8 +19,9 @@ #define DATABASEPASSWORDBACKEND_H #include "passwordbackend.h" +#include "qz_namespace.h" -class DatabasePasswordBackend : public PasswordBackend +class QT_QUPZILLA_EXPORT DatabasePasswordBackend : public PasswordBackend { public: explicit DatabasePasswordBackend(); diff --git a/src/lib/autofill/passwordbackends/passwordbackend.h b/src/lib/autofill/passwordbackends/passwordbackend.h index 81a12a9d0..2a2c15429 100644 --- a/src/lib/autofill/passwordbackends/passwordbackend.h +++ b/src/lib/autofill/passwordbackends/passwordbackend.h @@ -19,10 +19,11 @@ #define PASSWORDBACKEND_H #include "passwordmanager.h" +#include "qz_namespace.h" class QWidget; -class PasswordBackend +class QT_QUPZILLA_EXPORT PasswordBackend { public: explicit PasswordBackend(); diff --git a/src/lib/network/pac/proxyautoconfig.h b/src/lib/network/pac/proxyautoconfig.h index 922c415de..c281304d1 100644 --- a/src/lib/network/pac/proxyautoconfig.h +++ b/src/lib/network/pac/proxyautoconfig.h @@ -21,6 +21,8 @@ #include #include +#include "qz_namespace.h" + class QScriptContext; class QScriptEngine; @@ -29,7 +31,7 @@ class QScriptEngine; * * Based on qt-examples: https://gitorious.org/qt-examples/qt-examples/blobs/master/pac-files */ -class ProxyAutoConfig : public QObject +class QT_QUPZILLA_EXPORT ProxyAutoConfig : public QObject { Q_OBJECT diff --git a/src/lib/other/updater.h b/src/lib/other/updater.h index 37d1dbcc8..207771df9 100644 --- a/src/lib/other/updater.h +++ b/src/lib/other/updater.h @@ -34,7 +34,7 @@ public: explicit Updater(QupZilla* mainClass, QObject* parent = 0); ~Updater(); - struct Version { + struct QT_QUPZILLA_EXPORT Version { bool isValid; int majorVersion; int minorVersion; diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro index c8a27524c..2f5a320e9 100644 --- a/tests/autotests/autotests.pro +++ b/tests/autotests/autotests.pro @@ -11,10 +11,11 @@ TARGET = autotests !mac:unix: LIBS += $$PWD/../../bin/libQupZilla.so # Link plugins for PasswordBackends +!win32 { !unix|mac: LIBS += -L$$PWD/../../bin/plugins -lGnomeKeyringPasswords -lKWalletPasswords !mac:unix: LIBS += $$PWD/../../bin/plugins/libGnomeKeyringPasswords.so \ $$PWD/../../bin/plugins/libKWalletPasswords.so - +} unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN diff --git a/tests/autotests/main.cpp b/tests/autotests/main.cpp index 8ff39a08a..03f95ec15 100644 --- a/tests/autotests/main.cpp +++ b/tests/autotests/main.cpp @@ -49,8 +49,10 @@ int main(int argc, char *argv[]) RUN_TEST(DatabasePasswordBackendTest) RUN_TEST(DatabaseEncryptedPasswordBackendTest) +#ifndef Q_OS_WIN RUN_TEST(KWalletPasswordBackendTest) RUN_TEST(GnomeKeyringPasswordBackendTest) +#endif return 0; } diff --git a/tests/autotests/passwordbackendtest.cpp b/tests/autotests/passwordbackendtest.cpp index 2bfcf31e2..3d763be98 100644 --- a/tests/autotests/passwordbackendtest.cpp +++ b/tests/autotests/passwordbackendtest.cpp @@ -23,7 +23,11 @@ #include #include +#ifdef Q_OS_WIN +#include "qt_windows.h" +#else #include "unistd.h" +#endif static bool compareEntries(const PasswordEntry &value, const PasswordEntry &ref) { @@ -186,7 +190,11 @@ void PasswordBackendTest::updateLastUsedTest() entry.data = "entry1-data=23&username=user1&password=pass1"; m_backend->addEntry(entry); +#ifdef Q_OS_WIN + Sleep(1000); +#else sleep(1); +#endif entry.username.append("s"); m_backend->addEntry(entry); @@ -259,6 +267,7 @@ void DatabaseEncryptedPasswordBackendTest::cleanup() QSqlDatabase::removeDatabase(QSqlDatabase::database().databaseName()); } +#ifndef Q_OS_WIN // KWalletPassswordBackendTest void KWalletPasswordBackendTest::reloadBackend() { @@ -273,3 +282,4 @@ void GnomeKeyringPasswordBackendTest::reloadBackend() delete m_backend; m_backend = new GnomeKeyringPasswordBackend; } +#endif diff --git a/tests/autotests/passwordbackendtest.h b/tests/autotests/passwordbackendtest.h index d88ed05fd..af7d1a953 100644 --- a/tests/autotests/passwordbackendtest.h +++ b/tests/autotests/passwordbackendtest.h @@ -75,6 +75,7 @@ protected: void cleanup(); }; +#ifndef Q_OS_WIN #include "../../src/plugins/KWalletPasswords/kwalletpasswordbackend.h" class KWalletPasswordBackendTest : public PasswordBackendTest @@ -94,5 +95,6 @@ class GnomeKeyringPasswordBackendTest : public PasswordBackendTest protected: void reloadBackend(); }; +#endif #endif // PASSWORDBACKENDTEST_H