diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-06-30 17:45:52 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-30 16:04:24 -0700 |
| commit | 927bc5d60135f97f7241fbe9f77d745c6fceb517 (patch) | |
| tree | fb9612a8b94803ed2d0685275ef141e9eee9edab /subsurface.pro | |
| parent | 4c7ea24921ddf44b4250cf65209f96a4ff121620 (diff) | |
| download | subsurface-927bc5d60135f97f7241fbe9f77d745c6fceb517.tar.gz | |
Fixed SearchBar layout and icons
This is almost a rewrite of the Search function on the WebView
the old code had a few uneeded things, mostly being a subclass
of QMainWindow instead of the QWebView - this makes the code
use a tiny bit less ram.
The SearchBox was also moved to an own class ( we can use it
later to filter the contents of the DiveList for instance )
and a forced use of the pixmaps for the Mac and Windows platform
was added.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface.pro')
| -rw-r--r-- | subsurface.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subsurface.pro b/subsurface.pro index 3dec531c2..b9ff68a4f 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -4,7 +4,7 @@ QT = core gui network svg concurrent lessThan(QT_MAJOR_VERSION, 5) { QT += webkit } else { - !android: QT += webkitwidgets + !android: QT += webkitwidgets webkit android: QT += androidextras } INCLUDEPATH += qt-ui $$PWD @@ -191,13 +191,13 @@ FORMS = \ qt-ui/webservices.ui \ qt-ui/tableview.ui \ qt-ui/divelogimportdialog.ui \ - qt-ui/usermanual.ui \ + qt-ui/searchbar.ui \ qt-ui/divelogexportdialog.ui \ qt-ui/plannerSettings.ui \ qt-ui/usersurvey.ui # Nether usermanual or printing is supported on android right now -android: FORMS -= qt-ui/usermanual.ui qt-ui/printoptions.ui +android: FORMS -= qt-ui/printoptions.ui RESOURCES = subsurface.qrc |