summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-04-12 23:06:36 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-04-12 23:06:36 +0900
commitee04a7e23dcf75e30651004942f378d016fd0121 (patch)
tree16de0e18d2690f7ca565a48e2e7a3f37e0c698a6
parent57e74b846ab20e5ee27a288866e402df20c6b1f6 (diff)
downloadtqscintilla-ee04a7e23dcf75e30651004942f378d016fd0121.tar.gz
tqscintilla-ee04a7e23dcf75e30651004942f378d016fd0121.zip
Fix SEGV at runtime caused by invalid platform detection at build timer14.1.1r14.1.0
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--CMakeLists.txt1
-rw-r--r--include/Platform.h2
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--tqt/CMakeLists.txt2
4 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36dd942..cb91951 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
add_subdirectory( src )
add_subdirectory( tqt )
+add_subdirectory( example )
tde_conditional_add_subdirectory( BUILD_PLUGIN designer )
tde_conditional_add_project_docs( BUILD_DOC )
diff --git a/include/Platform.h b/include/Platform.h
index 19a6c40..303164b 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -26,7 +26,7 @@
#undef PLAT_FOX
#define PLAT_FOX 1
-#elif defined(QT)
+#elif defined(TQT)
#undef PLAT_TQT
#define PLAT_TQT 1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c565cf..51ca327 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ link_directories(
${TQT_LIBRARY_DIRS}
)
-add_definitions( -DQT -DSCI_LEXER )
+add_definitions( -DTQT -DSCI_LEXER )
##### src (static)
diff --git a/tqt/CMakeLists.txt b/tqt/CMakeLists.txt
index fa173d3..3cc49db 100644
--- a/tqt/CMakeLists.txt
+++ b/tqt/CMakeLists.txt
@@ -11,7 +11,7 @@ link_directories(
${TQT_LIBRARY_DIRS}
)
-add_definitions( -DTQT )
+add_definitions( -DTQT -DSCI_LEXER )
##### tqscintilla (shared)