diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-04 22:52:34 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-04 22:52:34 -0700 |
| commit | 60d5ab3a165d06a4c8bd9af1de1d71f4356ce492 (patch) | |
| tree | b39c804b5c23c3084f76716434a2d5354d6fe059 | |
| parent | b0a7e05a45a925d78efd00ecca6dce9b7a9530f9 (diff) | |
| parent | cf8525a571c29c18d6d1351bd89ebfef0c98bdaf (diff) | |
| download | bitcoin-60d5ab3a165d06a4c8bd9af1de1d71f4356ce492.tar.xz | |
Merge pull request #1038 from Diapolo/misc
small misc syntactic fixes
| -rw-r--r-- | bitcoin-qt.pro | 2 | ||||
| -rw-r--r-- | src/qt/bitcoin.qrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 7ad94037cf..2e50dc9668 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 8f2bba2737..e631a65155 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> |