Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build issues with MSVC2015 on Windows #175

Merged
merged 1 commit into from
May 3, 2016
Merged

Fix build issues with MSVC2015 on Windows #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions qtpass.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ FORMS += mainwindow.ui \
keygendialog.ui \
passworddialog.ui

QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
clang|gcc:QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas

nosingleapp {
QMAKE_CXXFLAGS += -DSINGLE_APP=0
Expand Down Expand Up @@ -112,7 +112,8 @@ win32 {
static {
QMAKE_LFLAGS += -static-libgcc -static-libstdc++
}
QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
gcc:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
msvc:QMAKE_LFLAGS += /DYNAMICBASE /NXCOMPAT
LIBS += -lmpr
} else:macx {
ICON = artwork/icon.icns
Expand Down
3 changes: 2 additions & 1 deletion util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
#include <QDir>
#ifdef Q_OS_WIN
#include <windows.h>
#endif
#else
#include <sys/time.h>
#endif
QProcessEnvironment Util::_env;
bool Util::_envInitialised;

Expand Down