diff options
| author | Laurent Montel <montel@kde.org> | 2018-09-14 07:04:05 +0200 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2018-09-14 07:04:41 +0200 |
| commit | 8b62375b2e072e31699d715509e80643918c6ac3 (patch) | |
| tree | 49523749eacf49edd7be6de60df3de71e8d40ad2 | |
| parent | 78aa01326a800aae9a14c3e15783c35d43a2f92b (diff) | |
| download | kconfig-8b62375b2e072e31699d715509e80643918c6ac3.tar.gz kconfig-8b62375b2e072e31699d715509e80643918c6ac3.tar.bz2 | |
Port deprecated method + use strict compile flags
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | autotests/fallbackconfigresourcestest.cpp | 2 | ||||
| -rw-r--r-- | autotests/kdesktopfiletest.cpp | 2 | ||||
| -rw-r--r-- | autotests/ksharedconfigtest.cpp | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c4c61602..f17172d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,11 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCONFIG VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigConfigVersion.cmake" SOVERSION 5) +add_definitions(-DQT_NO_CAST_FROM_ASCII) +add_definitions(-DQT_NO_CAST_TO_ASCII) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) +add_definitions(-DQT_USE_QSTRINGBUILDER) add_subdirectory(src) diff --git a/autotests/fallbackconfigresourcestest.cpp b/autotests/fallbackconfigresourcestest.cpp index f921031e..2a9d1be7 100644 --- a/autotests/fallbackconfigresourcestest.cpp +++ b/autotests/fallbackconfigresourcestest.cpp @@ -32,7 +32,7 @@ private Q_SLOTS: void FallbackConfigResourcesTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); } void FallbackConfigResourcesTest::testResourceFallbackFile() diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp index fd4a5c9e..4f8c5deb 100644 --- a/autotests/kdesktopfiletest.cpp +++ b/autotests/kdesktopfiletest.cpp @@ -29,7 +29,7 @@ QTEST_MAIN(KDesktopFileTest) void KDesktopFileTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); KConfigGroup actionRestrictions(KSharedConfig::openConfig(), "KDE Action Restrictions"); actionRestrictions.writeEntry("someBlockedAction", false); diff --git a/autotests/ksharedconfigtest.cpp b/autotests/ksharedconfigtest.cpp index ae3d40a2..281f7755 100644 --- a/autotests/ksharedconfigtest.cpp +++ b/autotests/ksharedconfigtest.cpp @@ -37,7 +37,7 @@ private: void KSharedConfigTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); m_path = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + QCoreApplication::applicationName() + QStringLiteral("rc"); |