aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-07-09 15:58:05 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-07-09 15:58:05 +0200
commitc87cdc9160d27e56d7a4236d1bab87e06c9b7c31 (patch)
tree9f15a1c3363e41b87d61d6d246c77535fe9d0e99
parent0b814f9ea3d47e35b6966061aa3f3c0aac5ab048 (diff)
wxp/mingw build fixes
-rw-r--r--bitcoin-qt.pro1
-rw-r--r--src/qt/bitcoin.cpp24
2 files changed, 13 insertions, 12 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 5dd37b0b7e..aee056eaee 100644
--- a/bitcoin-qt.pro
+++ b/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
QMAKE_CXXFLAGS += -fstack-protector
+QMAKE_LFLAGS += -fstack-protector
# 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
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index bcc73de865..63d1d70670 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -125,20 +125,20 @@ int main(int argc, char *argv[])
window.setClientModel(&clientModel);
window.setWalletModel(&walletModel);
-#ifdef Q_WS_WIN32
- // Windows-specific customization
- window.setAttribute(Qt::WA_TranslucentBackground);
- window.setAttribute(Qt::WA_NoSystemBackground, false);
- QPalette pal = window.palette();
- QColor bg = pal.window().color();
- bg.setAlpha(0);
- pal.setColor(QPalette::Window, bg);
- window.setPalette(pal);
- window.ensurePolished();
- window.setAttribute(Qt::WA_StyledBackground, false);
-#endif
if (QtWin::isCompositionEnabled())
{
+#ifdef Q_WS_WIN32
+ // Windows-specific customization
+ window.setAttribute(Qt::WA_TranslucentBackground);
+ window.setAttribute(Qt::WA_NoSystemBackground, false);
+ QPalette pal = window.palette();
+ QColor bg = pal.window().color();
+ bg.setAlpha(0);
+ pal.setColor(QPalette::Window, bg);
+ window.setPalette(pal);
+ window.ensurePolished();
+ window.setAttribute(Qt::WA_StyledBackground, false);
+#endif
QtWin::extendFrameIntoClientArea(&window);
window.setContentsMargins(0, 0, 0, 0);
}