Open hexabits opened 10 years ago
OK, so as far as how to progress with this, I believe that I'm going to make a series of branches, one which relies on the next, so that they can be merged to develop easily. I believe this is how this it'd work, but someone please correct me if I'm wrong.
Example:
git checkout -b qt5 dev
git commit -am "Initial Qt5 Port"
git checkout -b qt5-restructure qt5
git commit -am "Work from Issues #31, #27"
git checkout -b qt5-ui qt5-restructure
... And so on. (Obviously I do some work between checkout/commit. :))
That way either branch-by-branch can be merged into the develop branch OR the entirety of all the work can be pulled in by merging just the last branch.
Right? Or... I could just do the series of change in one branch, but I don't like that idea for whatever reason.
It really depends on whether or not you want the original branch merged in first or want to way for all the sub parts to be completed, i.e have your qt5 branch, makes changes, use that as a base for branching other features and then merge them back in.
If feature B needs feature A, local branch merging is fine but the faster things go to develop the quicker the turn around is with review & getting test builds out.that feeling you are getting there is the git merge mentality ;P
I've created qt5/master, and my first branch is qt5/pre-port which will consist of all the forward compatible changes I can make while still using Qt 4.8.
I will then probably:
I think that we should probably start into it as it would be nice to get some of your awesome updates into @niftools nifskope/develop.
For discussion and tracking of refactor issues.
Current Issues
#28 Qt 5 PortREADY
#36 FSEngine RefactorREADY
#31 Project RestructureREADY
#27 NifSkope.pro file cleanupREADY
24 Separate UI display from logic
13 Settings Restructure
11 Revert change which undid separate registry settings per version
40 Installer make target (NSIS, or alternative)
41 Post-Qt4 Port: Code Review, Refactor
Todo Issues (Not yet ticketed)
Ideas for Discussion
QT_NO_DEBUG
) and instead leaving qDebug() where ever we please and opting to defineQT_NO_DEBUG_OUTPUT
orQT_NO_WARNING_OUTPUT
for release builds in NifSkope.pro, which compiles away the debug statements.Completed
Roadmap