🏁 Fix winsock and autotype error when compiling on Windows

This commit is contained in:
thez3ro 2016-10-24 19:45:35 +02:00
parent 7c4129033a
commit 24a17c05ab
No known key found for this signature in database
GPG key ID: F628F9E41DD7C073
4 changed files with 14 additions and 5 deletions

View file

@ -13,5 +13,8 @@ if(UNIX AND NOT APPLE)
endif()
if(WITH_TESTS)
add_subdirectory(test)
endif()
# autotype non supported on Windows right now
if(UNIX)
add_subdirectory(test)
endif()
endif()

View file

@ -717,8 +717,8 @@ void MainWindow::repairDatabase()
KeePass2Writer writer;
writer.writeDatabase(saveFileName, dbRepairWidget->database());
if (writer.hasError()) {
MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
+ writer.errorString());
QMessageBox::critical(this, tr("Error"),
tr("Writing the database failed.").append("\n\n").append(writer.errorString()));
}
}
}

View file

@ -22,7 +22,12 @@
#include <QEventLoop>
#include <QtNetwork/QHostInfo>
#include <QtNetwork/QHostAddress>
#ifdef Q_OS_WIN
#include <winsock2.h>
#else
#include <netinet/in.h>
#endif
using namespace KeepassHttpProtocol;