- one-liner builds

client/main.cpp

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "mainwindow.h"
 #include <QApplication>
 #include <QLayout>
@@ -12,14 +13,14 @@ int main(int argc, char *argv[])
     helper::theme::applyCurrent(Settings::instance());
 
     QFont f = app.font();
-    f.setFamily("Monaco");
-    f.setPointSize(16);
+    // f.setFamily("Monaco");
+    f.setPointSize(14);
     app.setFont(f);
+    app.setApplicationName(APPNAME);
 
     // Path to database.
     QString path = Settings::instance().getDatabasePath();
 
-
     QString folder = QFileInfo(path).absoluteDir().path();
     Storage::instance().setPath(path);
 

client/noo.pro

@@ -7,7 +7,7 @@
 QT += core gui widgets printsupport
 
 CONFIG += c++17
-TARGET = Noo
+TARGET = noo
 TEMPLATE = app
 
 # Send version to app
@@ -39,15 +39,15 @@ macx {
 unix {
     DEFINES += TARGET_LINUX
     ICON = icons/app/noo_128x128.png
-    LIBS += -ldl -luuid ../lib/openssl/linux_x64/libssl.a ../lib/openssl/linux_x64/libcrypto.a
-    INCLUDEPATH += ../lib/openssl/include
+    LIBS += -ldl -luuid $$PWD/../lib/openssl/linux_x64/libssl.a $$PWD/../lib/openssl/linux_x64/libcrypto.a
+    INCLUDEPATH += $$PWD/../lib/openssl/include
 }
 
 
 DEFINES += USE_ENCRYPTED_DB
 DEFINES += SQLITE_HAS_CODEC SQLITE_TEMP_STORE=2 SQLITE_THREADSAFE
-INCLUDEPATH += sqlitecpp/include
-INCLUDEPATH += ../lib/include
+INCLUDEPATH += $$PWD/sqlitecpp/include
+INCLUDEPATH += $$PWD/../lib/include
 
 
 SOURCES += main.cpp                 \

scripts/build_outliner.py

@@ -43,24 +43,25 @@ if platform.system() == 'Linux':
     print('Configure...')
 
     qt_home = Path(os.environ['QT_HOME']).resolve()
-    cmake_params = {
-            'Qt5Core_DIR':           qt_home / 'lib/cmake/Qt5Core',
-            'Qt5Widgets_DIR':        qt_home / 'lib/cmake/Qt5Widgets',
-            'Qt5DBus_DIR':           qt_home / 'lib/cmake/Qt5DBus',
-            'Qt5Gui_DIR':            qt_home / 'lib/cmake/Qt5Gui',
-            'Qt5LinguistTools_DIR':  qt_home / 'lib/cmake/Qt5LinguistTools',
-            'Qt5PrintSupport_DIR':   qt_home / 'lib/cmake/Qt5PrintSupport',
-            'Qt5OpenGL_DIR':         qt_home / 'lib/cmake/Qt5OpenGL',
-            'Qt5Network_DIR':        qt_home / 'lib/cmake/Qt5Network'
-            }
+    # cmake_params = {
+    #         'Qt5Core_DIR':           qt_home / 'lib/cmake/Qt5Core',
+    #         'Qt5Widgets_DIR':        qt_home / 'lib/cmake/Qt5Widgets',
+    #         'Qt5DBus_DIR':           qt_home / 'lib/cmake/Qt5DBus',
+    #         'Qt5Gui_DIR':            qt_home / 'lib/cmake/Qt5Gui',
+    #         'Qt5LinguistTools_DIR':  qt_home / 'lib/cmake/Qt5LinguistTools',
+    #         'Qt5PrintSupport_DIR':   qt_home / 'lib/cmake/Qt5PrintSupport',
+    #         'Qt5OpenGL_DIR':         qt_home / 'lib/cmake/Qt5OpenGL',
+    #         'Qt5Network_DIR':        qt_home / 'lib/cmake/Qt5Network'
+    #         }
 
-    cmake_cmd = 'cmake '
-    for k,v in cmake_params.items():
-        cmake_cmd = f'{cmake_cmd} -D{k}={v} '
-    cmake_cmd = f'{cmake_cmd} ../../client'
-    print(f'cmake command line: {cmake_cmd}')
+    # cmake_cmd = 'cmake '
+    # for k,v in cmake_params.items():
+    #     cmake_cmd = f'{cmake_cmd} -D{k}={v} '
+    # cmake_cmd = f'{cmake_cmd} ../../client'
+    # print(f'cmake command line: {cmake_cmd}')
 
-    retcode = os.system(f'{cmake_cmd} ../../client')
+    # retcode = os.system(f'{cmake_cmd} ../../client')
+    retcode = os.system(f'{qt_home}/bin/qmake ../../client')
     if retcode != 0:
         print(f'cmake call failed with code {retcode}')
         exit(retcode)