Skip to content

Commit 911966b

Browse files
furszyfurszy
committed
[Build] build system QT fixes + duplicated moc object fix.
[Trivial] white spaces cleanup.
1 parent b9f6d43 commit 911966b

File tree

12 files changed

+13
-22
lines changed

12 files changed

+13
-22
lines changed

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
503503
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtlibpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
504504
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2],,AC_MSG_WARN([libqtpcre2 not found. Assuming qt has it built-in])))
505505
fi
506-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([svg_error] ,[qtlibsvg svg],,BITCOIN_QT_FAIL([libsvg not found. Assuming qt has it built-in])))
507506
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng qtharfbuzz harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
508507
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)))
509508
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)))

‎configure.ac‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,8 +1087,7 @@ else
10871087

10881088
BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], BITCOIN_QT_FAIL(libprotobuf not found)))
10891089
BITCOIN_QT_CHECK([AC_CHECK_LIB([Qt5Svg], [main],[SVG_LIBS=-lQt5Svg], BITCOIN_QT_FAIL(svg not found))])
1090-
BITCOIN_QT_CHECK([AC_CHECK_LIB([Qt5Charts], [main],[SVG_LIBS=-lQt5Charts], BITCOIN_QT_FAIL(charts not found))])
1091-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([qsvgwidget.h],, BITCOIN_QT_FAIL(svg not found))])
1090+
BITCOIN_QT_CHECK([AC_CHECK_LIB([Qt5Charts], [main],[CHARTS_LIBS=-lQt5Charts], BITCOIN_QT_FAIL(charts not found))])
10921091
if test x$use_qr != xno; then
10931092
BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
10941093
BITCOIN_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)])
@@ -1500,7 +1499,7 @@ echo " ARFLAGS = $ARFLAGS"
15001499
echo " PIC_FLAGS = $PIC_FLAGS"
15011500
echo " QT_PIE_FLAGS = $QT_PIE_FLAGS"
15021501
echo " SVG_LIBS = $SVG_LIBS "
1503-
echo " SVG_CFLAGS = $SVG_CFLAGS "
1504-
echo " CHARTS_LIBS = $CHARTS_LIBS "
1505-
echo " CHARTS_CFLAGS = $CHARTS_CFLAGS "
1502+
echo " SVG_CFLAGS = $SVG_CFLAGS "
1503+
echo " CHARTS_LIBS = $CHARTS_LIBS "
1504+
echo " CHARTS_CFLAGS = $CHARTS_CFLAGS "
15061505
echo

‎depends/packages/qt.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ define $(package)_stage_cmds
222222
$(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \
223223
$(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \
224224
$(MAKE) -C qtsvg INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
225-
$(MAKE) -C qtsvg/src/svg/ INSTALL_ROOT=$($(package)_staging_dir) install_target && \
226-
$(MAKE) -C qtsvg/src/plugins/imageformats INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
227225
$(MAKE) -C qtcharts INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
228226
echo "---FURSZY232 --> $($(package)_staging_dir)" && \
229227
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \

‎src/qt/intro.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,14 @@ bool Intro::pickDataDirectory()
184184

185185

186186
if (!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", false)) {
187-
// If current default data directory does not exist, let the user choose one
187+
// If current default data directory does not exist, let the user choose one
188188
Intro intro;
189189
intro.setDataDirectory(dataDir);
190190
intro.setWindowIcon(QIcon(":icons/bitcoin"));
191191

192192
while (true) {
193193
if (!intro.exec()) {
194-
// Cancel clicked
194+
// Cancel clicked
195195
return false;
196196
}
197197
dataDir = intro.getDataDirectory();
@@ -201,13 +201,13 @@ bool Intro::pickDataDirectory()
201201
} catch (fs::filesystem_error& e) {
202202
QMessageBox::critical(0, tr("PIVX Core"),
203203
tr("Error: Specified data directory \"%1\" cannot be created.").arg(dataDir));
204-
// fall through, back to choosing screen
204+
// fall through, back to choosing screen
205205
}
206206
}
207207

208208
settings.setValue("strDataDir", dataDir);
209209
}
210-
210+
211211
/* Only override -datadir if different from the default, to make it possible to
212212
* override -datadir in the pivx.conf file in the default data directory
213213
* (to be consistent with pivxd behavior)

‎src/qt/pivx/contactsdropdown.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ class ContViewHolder : public FurListRow<QWidget*>
4141
bool isLightTheme;
4242
};
4343

44-
45-
#include "qt/pivx/moc_contactsdropdown.cpp"
46-
4744
ContactsDropdown::ContactsDropdown(int minWidth, int minHeight, PWidget *parent) :
4845
PWidget(parent)
4946
{

‎src/qt/pivx/forms/sendmultirow.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
<item>
280280
<widget class="QLabel" name="labelSubtitleDescription">
281281
<property name="styleSheet">
282-
<string notr="true">margin-bottom:2px;
282+
<string notr="true">margin-bottom:2px;
283283
margin-left:0.05px;
284284
padding:0px;</string>
285285
</property>

‎src/qt/pivx/receivedialog.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ ReceiveDialog::ReceiveDialog(QWidget *parent) :
3737

3838

3939
// Buttons
40-
4140
ui->btnEsc->setText("");
4241
ui->btnEsc->setProperty("cssClass", "ic-close");
4342

‎src/qt/pivx/receivewidget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public slots:
3535
void onRequestClicked();
3636
void onMyAddressesClicked();
3737
void onNewAddressClicked();
38-
38+
3939
private slots:
4040
void changeTheme(bool isLightTheme, QString &theme) override ;
4141
void onLabelClicked();

‎src/qt/pivx/res/img/img-empty-staking-off.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎src/qt/pivx/settings/forms/settingsfaqwidget.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</size>
258258
</property>
259259
<property name="text">
260-
<string>5) Why my wallet convert my balance into
260+
<string>5) Why my wallet convert my balance into
261261
zPIV automatically?</string>
262262
</property>
263263
<property name="checkable">

0 commit comments

Comments
 (0)