put Q_OBJECT everywhere it should be (removes warnings when running lupdate)
This commit is contained in:
parent
e122e42354
commit
9b490f71b0
5 changed files with 18 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -14,6 +14,7 @@ src/bitcoind
|
|||
ui_*.h
|
||||
*.qm
|
||||
moc_*
|
||||
*.moc
|
||||
Makefile
|
||||
bitcoin-qt
|
||||
#resources cpp
|
||||
|
|
|
@ -5,14 +5,7 @@ DEFINES += QT_GUI
|
|||
# DEFINES += SSL
|
||||
CONFIG += no_include_pwd
|
||||
|
||||
# for boost 1.37, add -mt to the boost libraries
|
||||
LIBS += -lssl -lcrypto -ldb_cxx
|
||||
unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread
|
||||
macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt
|
||||
macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
|
||||
windows:LIBS += -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -lws2_32 -lgdi32
|
||||
windows:DEFINES += __WXMSW__
|
||||
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
|
||||
|
||||
# use: qmake "USE_UPNP=1"
|
||||
# miniupnpc (http://miniupnp.free.fr/files/) must be installed
|
||||
|
@ -22,6 +15,7 @@ count(USE_UPNP, 1) {
|
|||
LIBS += -lminiupnpc
|
||||
}
|
||||
|
||||
# use: qmake "USE_DBUS=1"
|
||||
count(USE_DBUS, 1) {
|
||||
message(Building with DBUS (Freedesktop notifications) support)
|
||||
DEFINES += QT_DBUS
|
||||
|
@ -176,6 +170,15 @@ TRANSLATIONS = src/qt/locale/bitcoin_nl.ts src/qt/locale/bitcoin_de.ts \
|
|||
OTHER_FILES += \
|
||||
README.rst
|
||||
|
||||
# Platform-specific libraries/includes
|
||||
# for boost 1.37, add -mt to the boost libraries
|
||||
unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread
|
||||
macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt
|
||||
macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
|
||||
windows:LIBS += -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -lws2_32 -lgdi32
|
||||
windows:DEFINES += __WXMSW__
|
||||
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
|
||||
|
||||
# For use with MacPorts
|
||||
macx:INCLUDEPATH += /opt/local/include /opt/local/include/db48
|
||||
macx:LIBS += -L/opt/local/lib -L/opt/local/lib/db48
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
/* First page of options */
|
||||
class MainOptionsPage : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainOptionsPage(QWidget *parent=0);
|
||||
|
||||
|
@ -45,6 +46,7 @@ public slots:
|
|||
|
||||
class DisplayOptionsPage : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit DisplayOptionsPage(QWidget *parent=0);
|
||||
|
||||
|
@ -58,6 +60,8 @@ public slots:
|
|||
|
||||
};
|
||||
|
||||
#include "optionsdialog.moc"
|
||||
|
||||
OptionsDialog::OptionsDialog(QWidget *parent):
|
||||
QDialog(parent), contents_widget(0), pages_widget(0),
|
||||
model(0), main_page(0), display_page(0)
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
class TxViewDelegate : public QAbstractItemDelegate
|
||||
{
|
||||
//Q_OBJECT
|
||||
Q_OBJECT
|
||||
public:
|
||||
TxViewDelegate(): QAbstractItemDelegate(), unit(BitcoinUnits::BTC)
|
||||
{
|
||||
|
@ -87,6 +87,7 @@ public:
|
|||
int unit;
|
||||
|
||||
};
|
||||
#include "overviewpage.moc"
|
||||
|
||||
OverviewPage::OverviewPage(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
|
|
|
@ -10,6 +10,7 @@ class CWalletTx;
|
|||
|
||||
class TransactionDesc: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
// Provide human-readable extended HTML description of a transaction
|
||||
static QString toHTML(CWallet *wallet, CWalletTx &wtx);
|
||||
|
|
Loading…
Reference in a new issue