diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-07-20 17:34:39 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-07-20 17:34:39 +0200 |
| commit | 57819218dc9fcfcec75c92ae1db910c9709df379 (patch) | |
| tree | fcc5adfff0724a8e142ea287b382b5d675f4fc81 /src | |
| parent | 06abd3f6f20ca2008b71fa3967baeaf53f5775eb (diff) | |
| parent | 7fbf49b216895d6870f46f54ab8e1289f541a723 (diff) | |
| download | kristall-57819218dc9fcfcec75c92ae1db910c9709df379.tar.gz | |
Merge branch 'master' of github.com:MasterQ32/kristall
Diffstat (limited to 'src')
| -rw-r--r-- | src/icons/AppIcon.icns | bin | 0 -> 69936 bytes | |||
| -rwxr-xr-x | src/icons/mac-icon.sh | 15 | ||||
| -rw-r--r-- | src/kristall.pro | 11 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 2 |
4 files changed, 28 insertions, 0 deletions
diff --git a/src/icons/AppIcon.icns b/src/icons/AppIcon.icns Binary files differnew file mode 100644 index 0000000..b2df08c --- /dev/null +++ b/src/icons/AppIcon.icns diff --git a/src/icons/mac-icon.sh b/src/icons/mac-icon.sh new file mode 100755 index 0000000..cd6e4e9 --- /dev/null +++ b/src/icons/mac-icon.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +mkdir AppIcon.iconset +rsvg-convert kristall.svg -h 1024 > AppIcon.iconset/icon_512x512@2.png +rsvg-convert kristall.svg -h 512 > AppIcon.iconset/icon_512x512.png +rsvg-convert kristall.svg -h 512 > AppIcon.iconset/icon_256x256@2.png +rsvg-convert kristall.svg -h 256 > AppIcon.iconset/icon_256x256.png +rsvg-convert kristall.svg -h 256 > AppIcon.iconset/icon_128x128@2.png +rsvg-convert kristall.svg -h 128 > AppIcon.iconset/icon_128x128.png +rsvg-convert kristall.svg -h 64 > AppIcon.iconset/icon_32x32@2.png +rsvg-convert kristall.svg -h 32 > AppIcon.iconset/icon_32x32.png +rsvg-convert kristall.svg -h 32 > AppIcon.iconset/icon_16x16@2.png +rsvg-convert kristall.svg -h 16 > AppIcon.iconset/icon_16x16.png +iconutil -c icns AppIcon.iconset +rm -rf AppIcon.iconset diff --git a/src/kristall.pro b/src/kristall.pro index 917c212..eca386e 100644 --- a/src/kristall.pro +++ b/src/kristall.pro @@ -47,6 +47,17 @@ win32-g++ { LIBS += -llibcrypto } +macx { + # Homebrew include paths + INCLUDEPATH += /usr/local/opt/qt/include + LIBS += -L/usr/local/opt/qt/lib + + INCLUDEPATH += /usr/local/opt/openssl/include + LIBS += -L/usr/local/opt/openssl/lib + + ICON = icons/AppIcon.icns +} + android: include(/home/felix/projects/android-hass/android-sdk/android_openssl/openssl.pri) # android { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index bf77974..ba80651 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -99,6 +99,8 @@ BrowserTab * MainWindow::addEmptyTab(bool focus_new, bool load_default) tab->navigateTo(QUrl("about:blank"), BrowserTab::DontPush); } + tab->focusUrlBar(); + return tab; } |