diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-13 23:52:41 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-13 23:52:41 -0800 |
| commit | 56de6b73f67d5ddeec74153303a27866e39279c7 (patch) | |
| tree | 45040e1fb23c26e12b3002e9381f13717a9eb78d /subsurface.pro | |
| parent | 2843dc38c9e64e87ac1ee84e2cb0147f630ab117 (diff) | |
| parent | f81e2c111d9c563a78e62c3bae64bec07c052ec0 (diff) | |
| download | subsurface-56de6b73f67d5ddeec74153303a27866e39279c7.tar.gz | |
Merge branch 'divesites'
This brings in the dive site infrastructure and initial UI work
Diffstat (limited to 'subsurface.pro')
| -rw-r--r-- | subsurface.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/subsurface.pro b/subsurface.pro index d65c94f50..4853796c0 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -29,6 +29,7 @@ HEADERS = \ display.h \ dive.h \ divelist.h \ + divesite.h \ file.h \ gettextfromc.h \ gettext.h \ @@ -119,6 +120,7 @@ SOURCES = \ device.c \ dive.c \ divelist.c \ + divesite.c \ equipment.c \ file.c \ gettextfromc.cpp \ @@ -238,7 +240,8 @@ FORMS = \ qt-ui/listfilter.ui \ qt-ui/diveshareexportdialog.ui \ qt-ui/filterwidget.ui \ - qt-ui/plannerDetails.ui + qt-ui/plannerDetails.ui \ + qt-ui/locationInformation.ui # Nether usermanual or printing is supported on android right now android: FORMS -= qt-ui/printoptions.ui |