Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bitcoin.moc in Makefile.qt.include #1444

Merged
merged 1 commit into from
May 16, 2019

Conversation

RoboticMind
Copy link
Contributor

See issue #1326. This file doesn't show up anywhere in our codebase. Was able to build without issue with Makefile.qt.include not including birtcoin.moc.

@jamescowens jamescowens self-requested a review April 29, 2019 17:06
Copy link
Member

@jamescowens jamescowens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the bitcoin.moc is a zero byte file. A relic...

@jamescowens
Copy link
Member

Hmm... it may be that there simply aren't any Qt special (meta) classes to put in the moc file for bitcoin.cpp, so it is zero length. If that is the case, it may not be safe to remove this from the build. @TheCharlatan?

@RoboticMind
Copy link
Contributor Author

RoboticMind commented Apr 29, 2019

If you mean it can't build without it, I was able to build on Ubuntu 18.04 and Travis built for all our platforms just fine with the line removed.

If you mean that it might be needed in the future,
¯\_(ツ)_/¯

@jamescowens
Copy link
Member

No. The issue is that if slots or signals are added to the bitcoin.cpp file, then the moc file will not be zero and will need to be included in the compilation.

@jamescowens
Copy link
Member

Let's see what TheCharlatan says about it.

@cyrossignol
Copy link
Member

cyrossignol commented May 2, 2019

It looks like @TheCharlatan added bitcoin.moc to the Makefile in fb1c3d8, commented it out in 019ecc5, and it was subsequently reverted by what really appears to be an unrelated clean-up change in ea054df--all for #487. I don't think we ever used it. The bitcoin.cpp file doesn't contain any of the preprocessor directives needed for the MOC generation to work, and it looks like Bitcoin removed it because their bitcoin.cpp uses a header file for which Qt generates MOC outputs automatically.

@jamescowens is right--if we ever extend Qt's magic objects in bitcoin.cpp, we'd need the build to regenerate this .moc, but we'd also need to add the missing directives. In this case, though, it seems like the better practice is to create a header with those classes. I think it's safe to merge this, at least for the sake of clearing it off the plate 🙂

@denravonska denravonska added this to the Elizabeth milestone May 16, 2019
@denravonska denravonska merged commit 36650a9 into gridcoin-community:development May 16, 2019
jamescowens added a commit that referenced this pull request Aug 20, 2019
Added:
 - Add freedesktop.org desktop file and icon set #1438 (@a123b)
 - Add warning in help for blockchain scan for importprivkey #1469 (@jamescowens)
 - Consolidateunspent rpc function #1472 (@jamescowens)
 - Scraper 2.0 improvements #1481, #1488, #1509, and #1514 (@jamescowens, @cyrossignol)
   - explorer mode operation
   - simplified explainmagnitude output
   - improved convergence reporting, including scraper information in the tooltip when fDebug3 is set
   - improved statistics and SB contract core caching based on a bClean flag in the cache global
   - new SB format and packing for bv11
   - new SB contract hashing (native) for bv11
   - changes to accomodate new beacon approach
   - Implement in memory versioning for team file ETags
 - Implement local dynamic team requirement removal and whitelist #1502 (@cyrossignol)

Changed:
 - Quiet logging for getmininginfo and scraper INFO logging level #1460 (@jamescowens)
 - Spelling corrections #1461, #1462 (@caraka)
 - Update crypto module #1453 (@denravonska)
 - Update .travis.yml for Bionic #1475 (@jamescowens)
 - Create CPID classes and clean up CPID code #1477 (@cyrossignol)
 - Refactor researcher context and CPID harvesting #1480 (@cyrossignol)
   - Remove boinckey export RPC method and import handler
 - Notify when wallet locked in advertisebeacon RPC method #1504 (@cyrossignol)
 - Notify when wallet locked in beaconstatus RPC method #1506 (@cyrossignol)
 - Change spacer minimum height hint #1511 (@jamescowens)

Removed:
 - Remove safe mode #1434 (@denravonska)
 - Remove bitcoin.moc in Makefile.qt.include #1444 (@RoboticMind)
 - Clean up legacy Proof-of-Work functions #1497 (@cyrossignol)

Fixed:
 - Constrain walletpassphrase to 10000000 seconds #1459 (@jamescowens)
 - Straighten out localization in the scraper. #1471 (@jamescowens)
 - Quick fix for rainbymagnitude #1473 (@jamescowens)
 - Correct negation error in scraper tooltip for vScrapersNotPublishing #1484 (@jamescowens)
 - Fix staked block rejection when active researcher #1485 (@cyrossignol)
 - Add back informational magnitude to generated blocks #1489 (@cyrossignol)
 - Add back in the in sync check in ScraperGetNeuralContract #1492 (@jamescowens)
 - Scraper correct team file processing. #1501 (@jamescowens)
 - Have importwallet file path default to datadir #1508 (@jamescowens)
 - Scraper add Beacon Map size check to ensure convergence #1515 (@jamescowens)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants