Commit 0fd48139 authored by Dorian Zedler's avatar Dorian Zedler

minor cleanup

parent fd09bc18
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="de.itsblue.SpeedClimbingStopwatchMonitor" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto"> <manifest package="de.itsblue.ScStwMonitor" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/>
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
......
...@@ -95,7 +95,7 @@ Window { ...@@ -95,7 +95,7 @@ Window {
text: index === 0 ? "A":"B" text: index === 0 ? "A":"B"
color: "#2a5266"//appTheme.style.textColor color: "#2a5266"
font.pixelSize: height font.pixelSize: height
font.family: timerFont.name font.family: timerFont.name
......
QT += quick widgets QT += quick widgets
CONFIG += c++11 CONFIG += c++11
TARGET = ScStwMonitor
CONFIG -= app_bundle CONFIG -= app_bundle
TARGET = ScStwMonitor
VERSION = 1.0
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use
# any feature of Qt which as been marked deprecated (the exact warnings # any feature of Qt which as been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the # depend on your compiler). Please consult the documentation of the
...@@ -17,10 +19,11 @@ DEFINES += QT_DEPRECATED_WARNINGS ...@@ -17,10 +19,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
SOURCES += \ SOURCES += \
main.cpp \ main.cpp \
baseconn.cpp baseconn.cpp
RESOURCES += qml.qrc \ RESOURCES += \
shared.qrc qml.qrc \
shared.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = QML_IMPORT_PATH =
...@@ -47,7 +50,7 @@ DISTFILES += \ ...@@ -47,7 +50,7 @@ DISTFILES += \
android/res/values/libs.xml \ android/res/values/libs.xml \
android/src/MainActivity.java android/src/MainActivity.java
contains(ANDROID_TARGET_ARCH,armeabi-v7a) { android {
ANDROID_PACKAGE_SOURCE_DIR = \ ANDROID_PACKAGE_SOURCE_DIR = \
$$PWD/android $$PWD/android
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment