summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--qt/PlatQt.cpp2
-rw-r--r--qt/qextscintillalexerpython.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea0899c..ec0bdfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ include( ConfigureChecks.cmake )
###### global compiler settings
-add_definitions( -DHAVE_CONFIG_H -UTQT_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"