Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make things more platform independent and allow custom fonts
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
  • Loading branch information
Herrie82 authored and pvuorela committed May 4, 2016
1 parent 4f76e2e commit d0b0453
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 377 deletions.
59 changes: 0 additions & 59 deletions dbusadaptor.cpp

This file was deleted.

54 changes: 0 additions & 54 deletions dbusadaptor.h

This file was deleted.

20 changes: 18 additions & 2 deletions fingerterm.pro
Expand Up @@ -2,6 +2,24 @@ QT = core gui qml quick dbus

CONFIG += link_pkgconfig

enable-feedback {
QT += feedback
DEFINES += HAVE_FEEDBACK
}

enable-nemonotifications {
PKGCONFIG += nemonotifications-qt5
}

isEmpty(DEFAULT_FONT) {
DEFINES += DEFAULT_FONTFAMILY=\\\"monospace\\\"
}

defined(DEFAULT_FONT)
{
DEFINES += DEFAULT_FONTFAMILY=\\\"$$DEFAULT_FONT\\\"
}

TEMPLATE = app
TARGET = fingerterm
DEPENDPATH += .
Expand Down Expand Up @@ -40,10 +58,8 @@ OTHER_FILES += \
RESOURCES += \
resources.qrc

unix {
target.path = /usr/bin
INSTALLS += target
}

contains(MEEGO_EDITION,nemo) {
desktopfile.extra = cp $${TARGET}.desktop.nemo $${TARGET}.desktop
Expand Down
2 changes: 1 addition & 1 deletion main.cpp
Expand Up @@ -200,7 +200,7 @@ void defaultSettings(QSettings* settings)
if(!settings->contains("ui/keyboardLayout"))
settings->setValue("ui/keyboardLayout", "english");
if(!settings->contains("ui/fontFamily"))
settings->setValue("ui/fontFamily", DEFAULT_FINGERTERM_FONTFAMILY);
settings->setValue("ui/fontFamily", DEFAULT_FONTFAMILY);
if(!settings->contains("ui/fontSize"))
settings->setValue("ui/fontSize", 11);
if(!settings->contains("ui/keyboardMargins"))
Expand Down
63 changes: 0 additions & 63 deletions qtc_packaging/debian_harmattan/changelog

This file was deleted.

1 change: 0 additions & 1 deletion qtc_packaging/debian_harmattan/compat

This file was deleted.

80 changes: 0 additions & 80 deletions qtc_packaging/debian_harmattan/control

This file was deleted.

14 changes: 0 additions & 14 deletions qtc_packaging/debian_harmattan/copyright

This file was deleted.

Whitespace-only changes.

0 comments on commit d0b0453

Please sign in to comment.