diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
| commit | 150676ce3df0f60bd99204886c3a4e458253c093 (patch) | |
| tree | d722dafb6487d2dc56e78f8e39965fb1b7bed362 /subsurface.pro | |
| parent | 48fe5254dc9540f6b9fc13ab17029e6c7b8de975 (diff) | |
| parent | 7264ec2fa877eeffa99745ac4d7af91b93217aa5 (diff) | |
| download | subsurface-150676ce3df0f60bd99204886c3a4e458253c093.tar.gz | |
Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
subsurface.pro
Diffstat (limited to 'subsurface.pro')
| -rw-r--r-- | subsurface.pro | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/subsurface.pro b/subsurface.pro index f3b0f97fe..af3f6e1b8 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -88,7 +88,11 @@ HEADERS = \ qt-ui/updatemanager.h \ qt-ui/divelogexportdialog.h \ qt-ui/usersurvey.h \ - subsurfacesysinfo.h + subsurfacesysinfo.h \ + qt-ui/configuredivecomputerdialog.h \ + configuredivecomputer.h \ + configuredivecomputerthreads.h \ + devicedetails.h android: HEADERS -= \ qt-ui/usermanual.h \ @@ -168,7 +172,11 @@ SOURCES = \ qt-ui/updatemanager.cpp \ qt-ui/divelogexportdialog.cpp \ qt-ui/usersurvey.cpp \ - subsurfacesysinfo.cpp + subsurfacesysinfo.cpp \ + qt-ui/configuredivecomputerdialog.cpp \ + configuredivecomputer.cpp \ + configuredivecomputerthreads.cpp \ + devicedetails.cpp android: SOURCES += android.cpp else: linux*: SOURCES += linux.c @@ -200,7 +208,8 @@ FORMS = \ qt-ui/divelogexportdialog.ui \ qt-ui/plannerSettings.ui \ qt-ui/usersurvey.ui \ - qt-ui/divecomponentselection.ui + qt-ui/divecomponentselection.ui \ + qt-ui/configuredivecomputerdialog.ui # Nether usermanual or printing is supported on android right now android: FORMS -= qt-ui/printoptions.ui |