Browse Source

wxp/mingw build fixes

miguelfreitas
Wladimir J. van der Laan 14 years ago
parent
commit
c87cdc9160
  1. 1
      bitcoin-qt.pro
  2. 4
      src/qt/bitcoin.cpp

1
bitcoin-qt.pro

@ -14,6 +14,7 @@ windows:LIBS += -lssl -lcrypto -lboost_system-mgw44-mt-1_43 -lboost_filesystem-m
# for extra security against potential buffer overflows # for extra security against potential buffer overflows
QMAKE_CXXFLAGS += -fstack-protector QMAKE_CXXFLAGS += -fstack-protector
QMAKE_LFLAGS += -fstack-protector
# disable quite some warnings because bitcoin core "sins" a lot # disable quite some warnings because bitcoin core "sins" a lot
QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch

4
src/qt/bitcoin.cpp

@ -125,6 +125,8 @@ int main(int argc, char *argv[])
window.setClientModel(&clientModel); window.setClientModel(&clientModel);
window.setWalletModel(&walletModel); window.setWalletModel(&walletModel);
if (QtWin::isCompositionEnabled())
{
#ifdef Q_WS_WIN32 #ifdef Q_WS_WIN32
// Windows-specific customization // Windows-specific customization
window.setAttribute(Qt::WA_TranslucentBackground); window.setAttribute(Qt::WA_TranslucentBackground);
@ -137,8 +139,6 @@ int main(int argc, char *argv[])
window.ensurePolished(); window.ensurePolished();
window.setAttribute(Qt::WA_StyledBackground, false); window.setAttribute(Qt::WA_StyledBackground, false);
#endif #endif
if (QtWin::isCompositionEnabled())
{
QtWin::extendFrameIntoClientArea(&window); QtWin::extendFrameIntoClientArea(&window);
window.setContentsMargins(0, 0, 0, 0); window.setContentsMargins(0, 0, 0, 0);
} }

Loading…
Cancel
Save