mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
f3f7bf51fa
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@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
32 lines
456 B
Text
32 lines
456 B
Text
*.o
|
|
*.orig
|
|
*.rej
|
|
*.exe
|
|
*.dmg
|
|
*.moc
|
|
*.moc.cpp
|
|
*.patch
|
|
*.ui.h
|
|
*.xml
|
|
version.h
|
|
!dives/*.xml
|
|
*~
|
|
po/*.mo
|
|
qt-ui/ui_*.h
|
|
/subsurface
|
|
/*.tar.gz
|
|
.dep/
|
|
share/
|
|
Documentation/docbook-xsl.css
|
|
Documentation/user-manual.html
|
|
Documentation/user-manual.pdf
|
|
Documentation/user-manual.text
|
|
packaging/windows/subsurface.nsi
|
|
packaging/macos/Info.plist
|
|
config.cache
|
|
*.qrc.cpp
|
|
/subsurface.config
|
|
/subsurface.creator
|
|
/subsurface.creator.user
|
|
/subsurface.files
|
|
/subsurface.includes
|