Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version to 2.0, freeze qt material version to 2.15 to stay in MD1 for qt 6.5, refactor docs #21

Merged
merged 2 commits into from
Mar 25, 2023
Merged

Bump version to 2.0, freeze qt material version to 2.15 to stay in MD1 for qt 6.5, refactor docs #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9378cff
bump versions
rnayabed Mar 25, 2023
4d8555b
bump versions and freeze qt material version
rnayabed Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ set(MACOSX_BUNDLE_COPYRIGHT "Debayan Sutradhar")
set(MACOSX_BUNDLE_GUI_IDENTIFIER io.github.rnayabed.rangoli)

add_compile_definitions(
DISABLE_QDEBUG=false

VERSION=${VERSION}
GIT_REPOSITORY="https://github.com/rnayabed/rangoli"
SUPPORTED_KEYBOARDS="https://github.com/rnayabed/rangoli/blob/master/supported-keyboards.md"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

*Free, Open Source, Lightweight, Cross-platform Software for Royal Kludge Keyboards*

![version](https://img.shields.io/badge/Version-1.0-green)
![version](https://img.shields.io/badge/Version-2.0-green)
![Total Downloads](https://img.shields.io/github/downloads/rnayabed/rangoli/total?label=Total%20Downloads)
[![Tip Me via PayPal](https://img.shields.io/badge/PayPal-Tip%20me-blue.svg?logo=paypal)](https://www.paypal.me/rnayabed)
[![Tip Me via Ko-Fi](https://img.shields.io/badge/Ko--Fi-Tip%20me-red.svg?logo=kofi)](https://ko-fi.com/rnayabed)
Expand Down
2 changes: 1 addition & 1 deletion installer/config/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>Rangoli</Name>
<Version>1.0</Version>
<Version>2.0</Version>
<Title>Rangoli Installer</Title>
<Publisher>Debayan Sutradhar</Publisher>
<StartMenuDir>Rangoli</StartMenuDir>
Expand Down
4 changes: 2 additions & 2 deletions installer/packages/io.github.rnayabed.rangoli/meta/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Package>
<DisplayName>Rangoli</DisplayName>
<Description>Install Rangoli on your system</Description>
<Version>1.0</Version>
<ReleaseDate>2023-02-11</ReleaseDate>
<Version>2.0</Version>
<ReleaseDate>2023-03-25</ReleaseDate>
<Licenses>
<License name="GNU General Public License Version 3.0" file="license.txt" />
</Licenses>
Expand Down
4 changes: 2 additions & 2 deletions src/KeyboardConfigurator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts // QTBUG-111187
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import QtQuick.Controls.Material 2.15
import QtQuick.Controls.Material.impl 2.15

import Rangoli

Expand Down
4 changes: 2 additions & 2 deletions src/KeyboardMenuButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import QtQuick.Controls.Material 2.15
import QtQuick.Controls.Material.impl 2.15

Item {
property alias kbName: kbName.text
Expand Down
4 changes: 2 additions & 2 deletions src/Main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import QtQuick.Controls.Material 2.15
import QtQuick.Controls.Material.impl 2.15
import Qt.labs.platform
import QtQml.Models

Expand Down
4 changes: 2 additions & 2 deletions src/Settings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import QtQuick.Controls.Material 2.15
import QtQuick.Controls.Material.impl 2.15
import QtQuick.Dialogs

import Rangoli
Expand Down
3 changes: 0 additions & 3 deletions src/messagehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ void MessageHandler::handler(QtMsgType messageType, const QMessageLogContext &co
{
Q_UNUSED(context)

if (messageType == QtDebugMsg && DISABLE_QDEBUG)
return;

m_logStream << QDateTime::currentDateTime().toString(u"[dd/MM/yyyy] [hh:mm:ss] "_s);

switch (messageType)
Expand Down