diff --git a/CMakeLists.txt b/CMakeLists.txt index 01e6f570..1fc06dcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,6 @@ endif(WIN32) add_definitions( -DQT_DEPRECATED_WARNINGS - -DQT_DISABLE_DEPRECATED_BEFORE=0x050600 -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII @@ -74,6 +73,10 @@ add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT ) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00) + + include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) find_package(LibVNCServer REQUIRED) diff --git a/krfb/main.cpp b/krfb/main.cpp index 04e30a81..05d64c8a 100644 --- a/krfb/main.cpp +++ b/krfb/main.cpp @@ -38,8 +38,6 @@ #include -static const char description[] = I18N_NOOP("VNC-compatible server to share " - "desktops"); static bool checkX11Capabilities() { int bp1, bp2, majorv, minorv; @@ -95,7 +93,7 @@ int main(int argc, char *argv[]) KAboutData aboutData(QStringLiteral("krfb"), i18n("Desktop Sharing"), QStringLiteral(KRFB_VERSION_STRING), - i18n(description), + i18n("VNC-compatible server to share desktops"), KAboutLicense::GPL, i18n("(c) 2009-2010, Collabora Ltd.\n" "(c) 2007, Alessandro Praduroux\n"