From: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Thu, 5 Apr 2012 05:52:34 +0000 (-0700)
Subject: Merge pull request #1038 from Diapolo/misc
X-Git-Tag: v0.4.0-unstable~129^2~109
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=60d5ab3a165d06a4c8bd9af1de1d71f4356ce492;hp=b0a7e05a45a925d78efd00ecca6dce9b7a9530f9;p=novacoin.git

Merge pull request #1038 from Diapolo/misc

small misc syntactic fixes
---

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 7ad9403..2e50dc9 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -87,7 +87,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
 }
 
 # disable quite some warnings because bitcoin core "sins" a lot
-QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-strict-aliasing -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-strict-aliasing -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
 
 # Input
 DEPENDPATH += src/qt src src json/include
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 8f2bba2..e631a65 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/icons" lang="edit">
+    <qresource prefix="/icons">
         <file alias="bitcoin">res/icons/bitcoin.png</file>
         <file alias="address-book">res/icons/address-book.png</file>
         <file alias="quit">res/icons/quit.png</file>