subsurface.git/.gitignore, branch v4.0.2

Dependencies are too aggressive for version.h

2013-10-16T02:54:15Z

Apparently qmake can't tell that #include "version.h" and #include "libdivecomputer/version.h" are not the same thing. Instead of spending another bunch of hours on fixing the buildsystem I decided to just cleanup the spots where we actually use the version file and rename it to ssrf-version.h. Signed-off-by: Dirk Hohndel

Ignore the Subsurface.app folder

2013-10-11T20:50:24Z

Signed-off-by: Dirk Hohndel

We no longer use the .translation file

2013-10-11T16:26:48Z

This was a broken workaround, anyway. Signed-off-by: Dirk Hohndel

Added rules on gitignore for the Translations generation.

2013-10-11T12:26:04Z

Added rules on the gitignore file for ignoring the translations that are generated during compile time. Signed-off-by: Tomaz Canabrava

Remove the old buildsystem

2013-10-09T06:29:43Z

Signed-off-by: Thiago Macieira

Implement a qmake-based build for Subsurface

2013-10-09T06:29:33Z

This is working for me, but requires a bit more testing. To build, run: qmake [options] Where options might be: V=1 disable "silent" build LIBDCDEVEL=1 use side-by-side libdivecomputer INCLUDEPATH+=xxx add -Ixxx (e.g., INCLUDEPATH+=/usr/local/marble/include) LIBS+=xxx add xxx to the linker flags (e.g. LIBS+=-L/usr/local/marble/lib) or any other qmake option, including debug and release options If your distribution is already using qtchooser in place of qmake, you may need to pass an extra option to qmake to select the a cross-build. For example: qmake -qt=i686-w64-mingw32-qt4 If your distribution is not yet using qtchooser, then you need to file a bug report requesting it and you need to run the full path to qmake. Note: - there are some ### left in the buildsystem Signed-off-by: Thiago Macieira

Added more wildcards to the Gitignore

2013-09-25T14:08:45Z

Gitignore is now ignoring callgrind files and kdevelop projects, this was annoying me. Signed-off-by: Tomaz Canabrava

Ignore ui_* files

2013-05-29T20:50:59Z

This makes using git from within QtCreator much easier.

Merge branch 'Qt'

2013-05-18T05:01:41Z

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 Signed-off-by: Dirk Hohndel

Ignore top-dir archives.

2013-05-12T14:26:00Z

Signed-off-by: Cristian Ionescu-Idbohrn Signed-off-by: Dirk Hohndel