diff --git a/mainwindow.cpp b/mainwindow.cpp index 1c937ca32..aa8b747f2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -9,6 +9,7 @@ #include #ifdef Q_OS_WIN #include +#include #undef DELETE #endif @@ -35,9 +36,7 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { #ifdef Q_OS_WIN -#ifndef __MINGW32__ if (useWebDav) WNetCancelConnection2A(passStore.toUtf8().constData(), 0, 1); -#endif #else if (fusedav.state() == QProcess::Running) { fusedav.terminate(); @@ -66,7 +65,6 @@ QSettings &MainWindow::getSettings() { void MainWindow::mountWebDav() { #ifdef Q_OS_WIN -#ifndef __MINGW32__ char dst[20] = {0}; NETRESOURCEA netres; memset(&netres, 0, sizeof(netres)); @@ -85,7 +83,6 @@ void MainWindow::mountWebDav() { ui->textBrowser->setTextColor(Qt::red); ui->textBrowser->setText(tr("Failed to connect WebDAV:\n") + message + " (0x" + QString::number(r, 16) + ")"); } -#endif #else fusedav.start("fusedav -o nonempty -u \"" + webDavUser + "\" " + webDavUrl + " \"" + passStore + '"'); fusedav.waitForStarted(); diff --git a/qtpass.pro b/qtpass.pro index d0fd15c28..75e789a5b 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -58,7 +58,7 @@ win32 { static { QMAKE_LFLAGS += -static-libgcc -static-libstdc++ } - QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat + QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat -lmpr } else:macx { ICON = artwork/icon.icns }