diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-12-06 16:14:32 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-12-08 16:29:05 +0100 |
| commit | 31b96d933fed651a7f779056cfa3f8dfc1a1cc0c (patch) | |
| tree | 813881a882bae0e3f8f8dbe1b83c31d6dea0e251 | |
| parent | a4cbbd1ec376b94577b17f1d0f5d9cdb2aefdf73 (diff) | |
| download | tqscintilla-31b96d933fed651a7f779056cfa3f8dfc1a1cc0c.tar.gz tqscintilla-31b96d933fed651a7f779056cfa3f8dfc1a1cc0c.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 591c8f8d77f742dd99e59dab537dd9d5a62e88a6)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qt/PlatQt.cpp | 2 | ||||
| -rw-r--r-- | qt/qextscintillalexerpython.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dadb5d..09fbb04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp index 4029f43..0f46659 100644 --- a/qt/PlatQt.cpp +++ b/qt/PlatQt.cpp @@ -819,7 +819,7 @@ ColourDesired Platform::ChromeHighlight() const char *Platform::DefaultFont() { - return TQApplication::font().family(); + return TQApplication::font().family().utf8(); } int Platform::DefaultFontSize() diff --git a/qt/qextscintillalexerpython.cpp b/qt/qextscintillalexerpython.cpp index ce53537..c9688e3 100644 --- a/qt/qextscintillalexerpython.cpp +++ b/qt/qextscintillalexerpython.cpp @@ -406,7 +406,7 @@ void QextScintillaLexerPython::setIndentationWarning(IndentationWarning warn) // Set the "tab.timmy.whinge.level" property. void QextScintillaLexerPython::setTabWhingeProp() { - emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn)); + emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn).latin1()); } #include "qextscintillalexerpython.moc" |