sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13254: Remove improper qt/moc_* cleaning glob from the general Makefile

Browse Source 
4138f42d24 Revert "Merge #12870: make clean removes src/qt/moc_ files" (Ben Woosley)

Pull request description:

  As noted by theuni and Sjors in #12870, qt moc cleaning is handled
  by CLEAN_QT via QT_MOC_CPP in Makefile.qt.include.

  In my testing I configured, built and cleaned with qt4 and qt5 both,
  absent the associated wildcard, and no MOC files were left after clean.
  Propose we revert the change and reconsider if a specific file
  is identified, and in that case add that file to QT_MOC_CPP.

  This reverts commit 1d540046fe, reversing
  changes made to ad960f5771.

Tree-SHA512: 5d5d07733b273e6d1f6cc6634e9bfab3d8ebbe2131ed9b80dafd73d22b4f99d13babf146023703d1cd6471d1d576305ba3ab6a75e6578c79f3caa3e76b407e7f
This commit is contained in:
MarcoFalke 2018-05-21 12:39:42 -04:00 committed by UdjinM6
parent 86ae5fcb64
commit ae4b1e0916
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -280,5 +280,6 @@ clean-docs:
rm -rf doc/doxygen rm -rf doc/doxygen
clean-local: clean-docs clean-local: clean-docs
rm -rf coverage_percent.txt test_dash.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) src/qt/moc_* rm -rf coverage_percent.txt test_dash.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache