Commit 355ae0ef authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile without deprecated methods

parent e520c00b
...@@ -46,7 +46,6 @@ set(KOMPARE_LIB_SOVERSION 5) ...@@ -46,7 +46,6 @@ set(KOMPARE_LIB_SOVERSION 5)
add_definitions( add_definitions(
-DQT_DEPRECATED_WARNINGS -DQT_DEPRECATED_WARNINGS
-DQT_DISABLE_DEPRECATED_BEFORE=0x050900
-DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_STRICT_ITERATORS -DQT_STRICT_ITERATORS
-DQT_USE_QSTRINGBUILDER -DQT_USE_QSTRINGBUILDER
...@@ -55,6 +54,10 @@ add_definitions( ...@@ -55,6 +54,10 @@ add_definitions(
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_FROM_BYTEARRAY
# -DQT_NO_URL_CAST_FROM_STRING # -DQT_NO_URL_CAST_FROM_STRING
) )
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
endif()
add_subdirectory( doc ) add_subdirectory( doc )
add_subdirectory( interfaces ) add_subdirectory( interfaces )
......
...@@ -89,7 +89,7 @@ int main(int argc, char* argv[]) ...@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
// see if we are starting with session management // see if we are starting with session management
if (app.isSessionRestored()) if (app.isSessionRestored())
{ {
RESTORE(KompareShell) kRestoreMainWindows<KompareShell>();
} }
else else
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment