No commit message

psemiletov · Nov 12, 2022 · e808652 · e808652
1 parent 9b4527c
commit e808652
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ add_definitions(${Qt${QT_VERSION_MAJOR}Widgets_COMPILE_DEFINITIONS})
 
 
 set(PROJECT "tea-qt")
-project ($PROJECT VERSION 62.0.0 LANGUAGES CXX C)
+project ($PROJECT VERSION 62.0.1 LANGUAGES CXX C)
 add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"")
 add_definitions(-DNOCRYPT=1)
 add_definitions(-DNOUNCRYPT=1)

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 //it's lazy updated file, so the real ChangeLog is the activity on github
 
+* 62.0.1 quick fix
 + Edit - Select all
 
 * Qt6 copy text with new lines - fixed

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 ====NEWS ABOUT TEA====
-TEA 62.0.0, November 2022
+TEA 62.0.1, November 2022
 ---------------------------------------------------
 http://tea.ourproject.org
 ---------------------------------------------------

diff --git a/NEWS-RU b/NEWS-RU
@@ -1,5 +1,5 @@
 =====НОВОСТИ ПРО ТИА====
-ТИА 62.0.0, ноябрь 2022
+ТИА 62.0.1, ноябрь 2022
 ======================
 http://tea.ourproject.org
 ---------------------------------------------------

diff --git a/document.cpp b/document.cpp
@@ -1111,8 +1111,8 @@ void CDocument::keyPressEvent (QKeyEvent *event)
       event->accept();
       return;
      }
+/*
 
-  /*
 #if QT_VERSION >= 0x050000
 
   if (event->key() == Qt::Key_C && (event->modifiers().testFlag(Qt::ControlModifier)))
@@ -1141,7 +1141,6 @@ void CDocument::keyPressEvent (QKeyEvent *event)
 #endif
 */
 
-#if QT_VERSION >= 0x050000
 
   if (event->key() == Qt::Key_C && (event->modifiers().testFlag(Qt::ControlModifier)))
      {
@@ -1166,9 +1165,6 @@ void CDocument::keyPressEvent (QKeyEvent *event)
      }
 
 
-#endif
-
-
   QPlainTextEdit::keyPressEvent (event);
 }
 
@@ -1373,10 +1369,12 @@ void CDocument::ed_copy()
 
   QString t = get();
 
+#if defined(Q_OS_UNIX)
+    t = t.replace (QChar::ParagraphSeparator, "\n");
+#endif
+
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-  t = t.replace (QChar::ParagraphSeparator, "\r\n");
-#elif defined(Q_OS_UNIX)
-  t = t.replace (QChar::ParagraphSeparator, "\n");
+    t = t.replace (QChar::ParagraphSeparator, "\r\n");
 #endif
 
   QClipboard *clipboard = QApplication::clipboard();
@@ -1392,10 +1390,12 @@ void CDocument::ed_cut()
 
   QString t = get();
 
+#if defined(Q_OS_UNIX)
+  t = t.replace (QChar::ParagraphSeparator, "\n");
+#endif
+
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
   t = t.replace (QChar::ParagraphSeparator, "\r\n");
-#elif defined(Q_OS_UNIX)
-  t = t.replace (QChar::ParagraphSeparator, "\n");
 #endif
 
   QClipboard *clipboard = QApplication::clipboard();
@@ -1415,7 +1415,7 @@ void CDocument::ed_paste()
 
 bool CDocument::has_selection()
 {
-   return textCursor().hasSelection();
+  return textCursor().hasSelection();
 }
 
 /*

diff --git a/meson.build b/meson.build
@@ -1,9 +1,9 @@
 project('tea', ['cpp','c'],
          default_options : ['cpp_std=c++11'],
-         version : '62.0.0',
+         version : '62.0.1',
          license : 'GPLv3')
 
-add_global_arguments('-DVERSION_NUMBER="62.0.0"', language : 'cpp')
+add_global_arguments('-DVERSION_NUMBER="62.0.1"', language : 'cpp')
 add_global_arguments('-DNOCRYPT="1"', language : 'cpp')
 add_global_arguments('-DNOUNCRYPT="1"', language : 'cpp')
 add_global_arguments('-DQUAZIP_STATIC="1"', language : 'cpp')

diff --git a/tea-qmake.pro b/tea-qmake.pro
@@ -1,7 +1,7 @@
-VERSION = 62.0.0
+VERSION = 62.0.1
 
 os2: {
-DEFINES += 'VERSION_NUMBER=\'"62.0.0"\''
+DEFINES += 'VERSION_NUMBER=\'"62.0.1"\''
 } else: {
   DEFINES += 'VERSION_NUMBER=\\\"$${VERSION}\\\"'
 }