Permalink
Browse files

Merge pull request #1038 from Diapolo/misc

small misc syntactic fixes
  • Loading branch information...
laanwj committed Apr 5, 2012
2 parents b0a7e05 + cf8525a commit 60d5ab3a165d06a4c8bd9af1de1d71f4356ce492
Showing with 2 additions and 2 deletions.
  1. +1 −1 bitcoin-qt.pro
  2. +1 −1 src/qt/bitcoin.qrc
View
@@ -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
View
@@ -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>

0 comments on commit 60d5ab3

Please sign in to comment.