Revert "Disable RTTI"

This reverts commit 85d3de15898385a06b2f34479e875c885e5df6be.
This breaks our old Qt on CentOS.

We can re-introduce this with #5470

diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 8240cdeb2627ab93d30266be009b32f015117f39..4a0d76d71f2d8952833568a366f75922c4321700 100644 (file)
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -1,8 +1,6 @@
 project(cmd)
 set(CMAKE_AUTOMOC TRUE)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
 set(cmd_NAME ${APPLICATION_EXECUTABLE}cmd)
 set(cmd_SRC
     cmd.cpp

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 733c1fb8d3b07e9371cd3e799e8eabb9f8188542..8f29674663d1ffa5c8beea007c8fb2ee0e16bd90 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -3,8 +3,6 @@ set(CMAKE_AUTOMOC TRUE)
 
 add_subdirectory(updater)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
 #TODO Move resources files
 qt_add_resources(MIRALL_RC_SRC ../../client.qrc)
 if ( IS_DIRECTORY ${OEM_THEME_DIR} )

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index d8b10d04c3034aed436034247890eb15f5edec37..116cea703aaf5ad3911d0c7d5ecc007f825bb90f 100644 (file)
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -229,7 +229,7 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
     Q_FOREACH(auto share, shares) {
 
         if (share->getShareType() == Share::TypeLink) {
-            _share = qSharedPointerObjectCast<LinkShare>(share);
+            _share = qSharedPointerDynamicCast<LinkShare>(share);
             _ui->pushButton_copy->show();
             _ui->pushButton_mail->show();
 

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 689763eeb2c9f3e9077d59adecc3b22b2b9f3b2d..cbece4b41c709c89167162ad738a2df0dc9f9a7a 100644 (file)
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -1,8 +1,6 @@
 project(libsync)
 set(CMAKE_AUTOMOC TRUE)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
 configure_file( version.h.in "${CMAKE_CURRENT_BINARY_DIR}/version.h" )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5c577cfa9eaf99dc9f50379c540074a904db2684..92363ea7aa69ecdc933e0abe4727bcf9e5b4360f 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,6 @@ include_directories(${CMAKE_BINARY_DIR}/csync ${CMAKE_BINARY_DIR}/csync/src ${CM
 include_directories(${CMAKE_SOURCE_DIR}/csync/src/)
 include_directories(${CMAKE_SOURCE_DIR}/csync/src/std ${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
 include(QtVersionAbstraction)
 setup_qt()