mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
124 lines
4.0 KiB
Plaintext
124 lines
4.0 KiB
Plaintext
From 5c6783cd3866c73d1cbf22cda37a8af38c911376 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 2 Mar 2021 13:58:35 +1000
|
|
Subject: Fix build
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 82ebc70..71ac1c2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -147,7 +147,7 @@ set(KEXI_EXAMPLES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/${KEXI_BASE_PATH}/examples
|
|
############################
|
|
###########################
|
|
|
|
-set(KEXI_FRAMEWORKS_MIN_VERSION 3.1.91)
|
|
+set(KEXI_FRAMEWORKS_MIN_VERSION 3.1)
|
|
|
|
##
|
|
## Test for KDb
|
|
@@ -268,7 +268,7 @@ add_subdirectory(src)
|
|
|
|
if(SHOULD_BUILD_DOC)
|
|
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS DocTools)
|
|
- add_subdirectory(doc)
|
|
+# add_subdirectory(doc)
|
|
endif()
|
|
|
|
# non-app directories are moved here because they can depend on SHOULD_BUILD_{appname} variables set above
|
|
@@ -285,5 +285,5 @@ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
|
|
|
find_package(KF5DocTools CONFIG)
|
|
if(KF5DocTools_FOUND)
|
|
- kdoctools_install(po)
|
|
+# kdoctools_install(po)
|
|
endif()
|
|
--
|
|
2.30.0
|
|
|
|
|
|
From 85bf19526e33a09dca35df0d901e62f2ba25fa20 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 2 Mar 2021 14:04:08 +1000
|
|
Subject: Add missing header
|
|
|
|
|
|
diff --git a/src/plugins/forms/widgets/kexidbdatepicker.cpp b/src/plugins/forms/widgets/kexidbdatepicker.cpp
|
|
index 1e0692d..92a5c88 100644
|
|
--- a/src/plugins/forms/widgets/kexidbdatepicker.cpp
|
|
+++ b/src/plugins/forms/widgets/kexidbdatepicker.cpp
|
|
@@ -22,6 +22,7 @@
|
|
#include "kexidbdatepicker.h"
|
|
#include <kexiutils/utils.h>
|
|
|
|
+#include <QDate>
|
|
#include <QLineEdit>
|
|
#include <QInputMethodEvent>
|
|
|
|
--
|
|
2.30.0
|
|
|
|
|
|
From 742151229356821b17d01bfbf64aeedf8e024d1f Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Wed, 3 Mar 2021 11:13:09 +1000
|
|
Subject: Use Fusion style for Haiku
|
|
|
|
|
|
diff --git a/src/main/KexiMainWindow.cpp b/src/main/KexiMainWindow.cpp
|
|
index ad351c4..fef51a5 100644
|
|
--- a/src/main/KexiMainWindow.cpp
|
|
+++ b/src/main/KexiMainWindow.cpp
|
|
@@ -337,6 +337,8 @@ bool setupApplication()
|
|
return false;
|
|
}
|
|
qApp->setStyle(style.take());
|
|
+#elif defined Q_OS_HAIKU
|
|
+ qApp->setStyle(QStyleFactory::create("Fusion"));
|
|
#endif
|
|
return true;
|
|
}
|
|
--
|
|
2.30.0
|
|
|
|
|
|
From 18367a713bd868b4a00817d2f62099cba54a4ca9 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Wed, 3 Mar 2021 13:04:47 +1000
|
|
Subject: Tune font sizes
|
|
|
|
|
|
diff --git a/src/kexiutils/FontSettings_p.cpp b/src/kexiutils/FontSettings_p.cpp
|
|
index a0a7a2c..d114130 100644
|
|
--- a/src/kexiutils/FontSettings_p.cpp
|
|
+++ b/src/kexiutils/FontSettings_p.cpp
|
|
@@ -42,6 +42,17 @@ FontSettingsData::~FontSettingsData()
|
|
static const char GeneralId[] = "General";
|
|
static const char DefaultFont[] = "Noto Sans";
|
|
|
|
+#ifdef Q_OS_HAIKU
|
|
+static const FontData DefaultFontData[FontSettingsData::FontTypesCount] = {
|
|
+ { GeneralId, "font", DefaultFont, 12, -1, QFont::SansSerif },
|
|
+ { GeneralId, "fixed", "Noto Sans Mono", 12, -1, QFont::Monospace },
|
|
+ { GeneralId, "toolBarFont", DefaultFont, 10, -1, QFont::SansSerif },
|
|
+ { GeneralId, "menuFont", DefaultFont, 12, -1, QFont::SansSerif },
|
|
+ { "WM", "activeFont", DefaultFont, 12, -1, QFont::SansSerif },
|
|
+ { GeneralId, "taskbarFont", DefaultFont, 12, -1, QFont::SansSerif },
|
|
+ { GeneralId, "smallestReadableFont", DefaultFont, 10, -1, QFont::SansSerif }
|
|
+};
|
|
+#else
|
|
static const FontData DefaultFontData[FontSettingsData::FontTypesCount] = {
|
|
{ GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif },
|
|
{ GeneralId, "fixed", "Oxygen Mono", 9, -1, QFont::Monospace },
|
|
@@ -51,6 +62,7 @@ static const FontData DefaultFontData[FontSettingsData::FontTypesCount] = {
|
|
{ GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif },
|
|
{ GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif }
|
|
};
|
|
+#endif
|
|
|
|
QFont FontSettingsData::font(FontTypes fontType)
|
|
{
|
|
--
|
|
2.30.0
|
|
|