diff options
| -rw-r--r-- | Configure.mk | 60 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | subsurface.qrc | 1 |
3 files changed, 32 insertions, 30 deletions
diff --git a/Configure.mk b/Configure.mk index 99292795a..de4c0b0d8 100644 --- a/Configure.mk +++ b/Configure.mk @@ -109,7 +109,7 @@ LIBXML2 = $(shell $(XML2CONFIG) --libs) LIBXSLT = $(shell $(XSLCONFIG) --libs) XML2CFLAGS = $(shell $(XML2CONFIG) --cflags) GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0) -GTKCFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0) +GTKCFLAGS += $(shell $(PKGCONFIG) --cflags gtk+-2.0) XSLCFLAGS = $(shell $(XSLCONFIG) --cflags) OSMGPSMAPFLAGS += $(shell $(PKGCONFIG) --cflags osmgpsmap 2> /dev/null) LIBOSMGPSMAP += $(shell $(PKGCONFIG) --libs osmgpsmap 2> /dev/null) @@ -126,35 +126,35 @@ SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3)) all: configure configure $(CONFIGURE): Configure.mk @echo "\ - CONFIGURED = 1 \\\ - UNAME = $(UNAME) \\\ - LIBDIVECOMPUTERDIR = $(LIBDIVECOMPUTERDIR) \\\ - LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERCFLAGS) \\\ - LIBDIVECOMPUTER = $(LIBDIVECOMPUTER) \\\ - LIBQT = $(LIBQT) \\\ - QTCXXFLAGS = $(QTCXXFLAGS) \\\ - MOC = $(MOC) \\\ - UIC = $(UIC) \\\ - RCC = $(RCC) \\\ - LIBGTK = $(LIBGTK) \\\ - GTKCFLAGS = $(GTKCFLAGS) \\\ - LIBGCONF2 = $(LIBGCONF2) \\\ - GCONF2CFLAGS = $(GCONF2CFLAGS) \\\ - GTK_MAC_BUNDLER = $(GTK_MAC_BUNDLER) \\\ - LIBXML2 = $(LIBXML2) \\\ - LIBXSLT = $(LIBXSLT) \\\ - XML2CFLAGS = $(XML2CFLAGS) \\\ - GLIB2CFLAGS = $(GLIB2CFLAGS) \\\ - XSLCFLAGS = $(XSLCFLAGS) \\\ - OSMGPSMAPFLAGS = $(OSMGPSMAPFLAGS) \\\ - LIBOSMGPSMAP = $(LIBOSMGPSMAP) \\\ - LIBSOUPCFLAGS = $(LIBSOUPCFLAGS) \\\ - LIBSOUP = $(LIBSOUP) \\\ - LIBZIP = $(LIBZIP) \\\ - ZIPFLAGS = $(ZIPFLAGS) \\\ - LIBSQLITE3 = $(LIBSQLITE3) \\\ - SQLITE3FLAGS = $(SQLITE3FLAGS) \\\ - " | sed 's,\\,\n,g' > $(CONFIGFILE) + CONFIGURED = 1\\\ + UNAME = $(UNAME)\\\ + LIBDIVECOMPUTERDIR = $(LIBDIVECOMPUTERDIR)\\\ + LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERCFLAGS)\\\ + LIBDIVECOMPUTER = $(LIBDIVECOMPUTER)\\\ + LIBQT = $(LIBQT)\\\ + QTCXXFLAGS = $(QTCXXFLAGS)\\\ + MOC = $(MOC)\\\ + UIC = $(UIC)\\\ + RCC = $(RCC)\\\ + LIBGTK = $(LIBGTK)\\\ + GTKCFLAGS = $(GTKCFLAGS)\\\ + LIBGCONF2 = $(LIBGCONF2)\\\ + GCONF2CFLAGS = $(GCONF2CFLAGS)\\\ + GTK_MAC_BUNDLER = $(GTK_MAC_BUNDLER)\\\ + LIBXML2 = $(LIBXML2)\\\ + LIBXSLT = $(LIBXSLT)\\\ + XML2CFLAGS = $(XML2CFLAGS)\\\ + GLIB2CFLAGS = $(GLIB2CFLAGS)\\\ + XSLCFLAGS = $(XSLCFLAGS)\\\ + OSMGPSMAPFLAGS = $(OSMGPSMAPFLAGS)\\\ + LIBOSMGPSMAP = $(LIBOSMGPSMAP)\\\ + LIBSOUPCFLAGS = $(LIBSOUPCFLAGS)\\\ + LIBSOUP = $(LIBSOUP)\\\ + LIBZIP = $(LIBZIP)\\\ + ZIPFLAGS = $(ZIPFLAGS)\\\ + LIBSQLITE3 = $(LIBSQLITE3)\\\ + SQLITE3FLAGS = $(SQLITE3FLAGS)\\\ + " | tr '\\' '\n' > $(CONFIGFILE) else configure $(CONFIGFILE): Configure.mk diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index bb4bda1af..adfb3c74a 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -26,6 +26,7 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()), { ui->setupUi(this); ui->ListWidget->setModel(model); + this->setWindowIcon(QIcon(":subsurface-icon")); // Just to test the star widgets, can be safely removed. StarWidget *star = new StarWidget(0); star->setMaximumStars(10); diff --git a/subsurface.qrc b/subsurface.qrc index e257bf8f5..e1939f28e 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -1,5 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file alias="star">star.svg</file> + <file alias="subsurface-icon">subsurface-icon.png</file> </qresource> </RCC> |