Polish on legacy removal changes

sailfishos · May 4, 2016 · 784ebca · 784ebca
1 parent d0b0453
commit 784ebca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/fingerterm.pro b/fingerterm.pro
@@ -1,24 +1,21 @@
-QT = core gui qml quick dbus 
+QT = core gui qml quick dbus
 
 CONFIG += link_pkgconfig
 
 enable-feedback {
-    QT += feedback  
-    DEFINES += HAVE_FEEDBACK  
+    QT += feedback
+    DEFINES += HAVE_FEEDBACK
 }
 
 enable-nemonotifications {
-    PKGCONFIG += nemonotifications-qt5  
+    PKGCONFIG += nemonotifications-qt5
 }
 
 isEmpty(DEFAULT_FONT) {
-    DEFINES += DEFAULT_FONTFAMILY=\\\"monospace\\\"  
+    DEFAULT_FONT = monospace
 }
 
-defined(DEFAULT_FONT)
-{
-	DEFINES += DEFAULT_FONTFAMILY=\\\"$$DEFAULT_FONT\\\"
-}
+DEFINES += DEFAULT_FONTFAMILY=\\\"$$DEFAULT_FONT\\\"
 
 TEMPLATE = app
 TARGET = fingerterm
@@ -34,7 +31,8 @@ HEADERS += \
     version.h \
     util.h \
     keyloader.h \
-    mainwindow.h 
+    mainwindow.h
+
 SOURCES += \
     main.cpp \
     terminal.cpp \

diff --git a/main.cpp b/main.cpp
@@ -166,10 +166,6 @@ int main(int argc, char *argv[])
     } else
         view.show();
 
-#ifdef RESIZE_ROOT_QML_TO_VIEW
-    view.setResizeMode(QQuickView::SizeRootObjectToView);
-#endif
-
     PtyIFace ptyiface(pid, socketM, &term,
                        settings->value("terminal/charset").toString());