Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

Commit

Permalink
Remotes Module: drop Qt4 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@antis81
antis81 committed Mar 19, 2015
1 parent 23b4cc1 commit f0fe98e
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Remotes/RemotesModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,3 @@ void RemotesModule::onRemoteCreate()
{
RemoteCreateEditDlg().exec();
}

#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( Remotes, RemotesModule )
#endif

3 comments on commit f0fe98e

@scunz
Copy link
Member

@scunz scunz commented on f0fe98e Mar 20, 2015

Choose a reason for hiding this comment

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

This is a very general comment, only marginally related to this PR and is more to be seen as a generic advice for improvement:

When doing something that has absolutely nothing to do with the objective of a given branch / PR, then I'd be a good idea to take that single change, cherry-pick it on top of development and either push it directly (like for example with this commit: We've actually agreed doing this, so let's just push it over) or create a separate pull request for it.

I remember that I've recently said that "I never develop on the development branch". This is exactly what I mean: I have a very "private" branch and I try to isolate each commit so that it doesn't affect anything else. This allows me to incrementally develop in one branch and (later) distribute the changes into different branches.

@antis81
Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks actually for this hint. I tried this path in the morning and the good thing about it is, that it avoids "branch hopping". That means, create and switch branches to divide several features & fixes into the appropriate branches. On the other hand this improves my "cherry picking" skills 😄.

I decided to not directly push this change to development -> We now have a ngf/drop-qt4 fetaure branch containing this change. I.e. PR #104 excludes this commit.

@scunz
Copy link
Member

@scunz scunz commented on f0fe98e Mar 21, 2015

Choose a reason for hiding this comment

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

Yeah, that's cool. Now we can start from there and actually make that "single topic" complete - i.e. once you realised that the modules have that code at the end of their module.cpp, you separated that change and can revisit it now, so that you do that change consistently through all modules - and then the problem's gone... :)

Please sign in to comment.