wxp/mingw build fixes

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 5dd37b0b7e12f2d6c15b8397828e6b3335cd48ea..aee056eaee572bbe7826073ca73ae0e49e4c10a0 100644 (file)
--- 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 bcc73de8659af4cd1cd6bbfa03edc86cd82cfdf8..63d1d70670fc15ebe3dd37ac0494413f6ad10f1f 100644 (file)
--- 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);
                 }