Qt5 support for CalcQt example #98
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Feb 13, 2016
Closed
| find_package(Qt4 COMPONENTS QtCore QtGui QtTest) | ||
| set(CALCQT_HEADERS src/CalculatorWidget.h) | ||
| set(CALCQT_SOURCES src/CalcQt.cpp src/CalculatorWidget.cpp) | ||
| set(LIBCALCQT_BUILD OFF) |
There was a problem hiding this comment.
Is LIBCALCQT_BUILD really needed? If it's for the if(LIBCALCQT_BUILD) later on, can't you use the QT_LIBRARIES variable?
There was a problem hiding this comment.
Good idea ;) Let's check that.
|
Nice PR! I trust you have tested it with QT5, and I have with QT4. Apart from the comment it should be ready to merge. |
|
Ok, now it should be ready for merging if travis tests passes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now CalcQt example should work on both Qt4 and Qt5.
I think this also fixes issue #83 as i've changed calcqt library to libcalcqt.