merging from Qt into master

[Tomaz Canabrava]

Dirk,

I just did a pull-request for you, I followed the other irc-guys advices,
here's the full output.:

![tomaz at trantor subsurface]$ git request-pull dirk/Qt origin
The following changes since commit 7ea22811802cda1df227e7fb4b76720fc15b2dcd:

  Introduce QApplication (2013-04-01 16:03:59 +0300)

are available in the git repository at:

  https://github.com/tcanabrava/subsurface.git qt

for you to fetch changes up to db13d80d9a489d2757b006bd311c9cab43cf43d5:

  Added a CMake build system for and make the Qt ui and GTK ui appear
(2013-04-07 14:52:01 -0300)

----------------------------------------------------------------
Tomaz Canabrava (12):
      Initial Skeleton of the Qt Gui
      Initial Skeleton of the Qt Gui
      First skeleton of a Qt Application Working.
      Creation of the tabs in the main window.
      Moved qt-gui to qt-ui
      Removed a bunch of uneeded files, merged 4 classes in MainTab for
better management.
      Removed a lot of uneeded files.
      Added project file for Qt5
      Fixed the Makefile
      Merge branch 'qt' of https://github.com/tcanabrava/subsurface into qt
      Removed the qt-gui directory.
      Added a CMake build system for and make the Qt ui and GTK ui appear

 .gitignore                |   3 +
 CMakeLists.txt            |  68 +++++++++++++++
 Makefile                  |  42 +++------
 cmake/FindGConf.cmake     |  87 +++++++++++++++++++
 cmake/FindGLib.cmake      | 103 ++++++++++++++++++++++
 cmake/FindLibSoup.cmake   | 166 ++++++++++++++++++++++++++++++++++++
 cmake/FindOsmGpsMap.cmake |  28 ++++++
 qt-gui.cpp                |  10 ++-
 qt-ui/maintab.cpp         |   9 ++
 qt-ui/maintab.h           |  20 +++++
 qt-ui/maintab.ui          | 810
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qt-ui/mainwindow.cpp      |  10 +++
 qt-ui/mainwindow.h        |  24 ++++++
 qt-ui/mainwindow.ui       | 297
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qt-ui/plotareascene.cpp   |   0
 qt-ui/plotareascene.h     |   0
 qt-ui/qt-ui.pro           |  12 +++
 17 files changed, 1656 insertions(+), 33 deletions(-)
 create mode 100644 CMakeLists.txt
 create mode 100644 cmake/FindGConf.cmake
 create mode 100644 cmake/FindGLib.cmake
 create mode 100644 cmake/FindLibSoup.cmake
 create mode 100644 cmake/FindOsmGpsMap.cmake
 create mode 100644 qt-ui/maintab.cpp
 create mode 100644 qt-ui/maintab.h
 create mode 100644 qt-ui/maintab.ui
 create mode 100644 qt-ui/mainwindow.cpp
 create mode 100644 qt-ui/mainwindow.h
 create mode 100644 qt-ui/mainwindow.ui
 create mode 100644 qt-ui/plotareascene.cpp
 create mode 100644 qt-ui/plotareascene.h
 create mode 100644 qt-ui/qt-ui.pro
![tomaz at trantor subsurface]$



2013/4/7 Dirk Hohndel <dirk at hohndel.org>

>
> Henrik convinced me to actually track the changes to the core logic in
> master (and to also cherry-pick commits that fix real issues). So I did
> just that with the divelist split and one of Alberto's commits.
>
> This way it's easier to a) make sure that the logic separation code is
> correct and doesn't break functionality and b) to track fixes that are
> made on either branch.
>
> I know that Linus dislikes cherry picking between branches like that,
> but it does seem like a good way to deal with this process - at least as
> long as this doesn't require us to make unnatural choices on the Qt
> branch.
>
>
> /D
> _______________________________________________
> subsurface mailing list
> subsurface at hohndel.org
> http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20130407/e0dcc70f/attachment.html>