reversing roles -- new Gtk branch & Qt branch merged into master

[Dirk Hohndel]

Hi everyone

Here's a commit that I pushed out a little while ago. I think it says it
all.

Actually, no, it is missing one thing. An enormous THANK YOU and HATS
OFF to Tomaz. He has single-handedly done the work in the Qt branch.
Yes, there are a few commits from others (Alberto, Amit, Thiago, etc),
but fundamentally the Qt port has been a one man show. And how far we
have gotten in six weeks is just amazing.

Yes, this is far from being 'on par' with the 3.1 release - yet it
already shows many ways in which I think the Qt version will be better
than the Gtk version.

Please be nice, provide constructive feedback, or (even better) start
working on making things better. We had several people speak up in the
run-up to the decision to do a Qt port mention that they would really
like to contribute to the Qt port. Amit certainly has stepped up and
provided patches. I hope others will do the same.

Thanks Tomaz, thanks Linus for your invaluable help getting the Qt
branch merged. Let's do this

/D

PS: here's the merge commit:

commit f3f7bf51fa1dbe9cdb859e1a45b20c108613275b
Merge: 082ec43 56dbb7c
Author: Dirk Hohndel <dirk at hohndel.org>
Date:   Fri May 17 22:01:41 2013 -0700

Merge branch 'Qt'

After the 3.1 release it is time to shift the focus on the Qt effort -
and the best way to do this is to merge the changes in the Qt branch
into master.
    
Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version
of the Qt branch) and then used his merge to double check what I was
doing.
    
I resolved a few things differently but overall what we did was very
much the same (and I say this with pride since Linus is a professional
git merger)
    
Here's his merge commit message:
    
  This is a rough and tumble merge of the Qt branch into 'master',
  trying to sort out the conflicts as best as I could.

  There were two major kinds of conflicts:

   - the Makefile changes, in particular the split of the single
     Makefile into Rules.mk and Configure.mk, along with the obvious Qt
     build changes themselves.
    
     Those changes conflicted with some of the updates done in mainline
     wrt "release" targets and some helper macros ($(NAME) etc).

     Resolved by largely taking the Qt branch versions, and then editing
     in the most obvious parts of the Makefile updates from mainline.

     NOTE! The script/get_version shell script was made to just fail
     silently on not finding a git repository, which avoided having to
     take some particularly ugly Makefile changes.
    
   - Various random updates in mainline to support things like dive
     tags.
    
     The conflicts were mainly to the gtk GUI parts, which obviously
     looked different afterwards.  I fixed things up to look like the
     newer code, but since the gtk files themselves are actually dead in
     the Qt branch, this is largely irrelevant.

     NOTE! This does *NOT* introduce the equivalent Qt functionality.
     The fields are there in the code now, but there's no Qt UI for the
     whole dive tag stuff etc.

  This seems to compile for me (although I have to force
  "QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
  work, but it is otherwise largely untested.

Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk at hohndel.org>