diff options
| author |  ctrlaltca | 2024-02-11 16:36:22 +0100 |
|---|---|---|
| committer |  GitHub | 2024-02-11 16:36:22 +0100 |
| commit | 9b8fa92ef5cceccfbb463ccd18cab89d60d5d836 (patch) | |
| tree | 9b5364c0368a7309b5ffddfc23beb70e97c2fcb2 | |
| parent | Add support for sanitizers at compile time (and fix some issues) (#2599) (diff) | |
| download | KVIrc-9b8fa92ef5cceccfbb463ccd18cab89d60d5d836.tar.gz KVIrc-9b8fa92ef5cceccfbb463ccd18cab89d60d5d836.tar.bz2 KVIrc-9b8fa92ef5cceccfbb463ccd18cab89d60d5d836.zip | |
Replace deprecated define. Fix #2601 (#2603)
| -rw-r--r-- | cmake/kvi_sysconfig.h.cmake | 2 | ||||
| -rw-r--r-- | src/kvilib/config/kvi_settings.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/kvi_sysconfig.h.cmake b/cmake/kvi_sysconfig.h.cmake index 073abb192..11d8f804e 100644 --- a/cmake/kvi_sysconfig.h.cmake +++ b/cmake/kvi_sysconfig.h.cmake @@ -73,7 +73,7 @@ // KVIrc detects the modules directory on macs/win32 by itself // this seems to be used on linux only -#if !(defined(Q_OS_MACX) || defined(MINGW) || defined(MSVC)) +#if !(defined(Q_OS_MACOS) || defined(MINGW) || defined(MSVC)) #define KVIRC_RESOURCES_DIR "${CMAKE_KVIRC_RESOURCES_DIR}" #define KVIRC_MODULES_DIR "${CMAKE_KVIRC_MODULES_DIR}" #endif diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index c1adfc87f..1b2641b48 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -128,8 +128,8 @@ #define KVIRC_API_TYPEDEF // note: cmake defines "APPLE" but we're not using it since it includes legacy mac os version (pre-X) -// we use qt's Q_OS_MACX instead -#ifdef Q_OS_MACX +// we use qt's Q_OS_MACOS instead +#ifdef Q_OS_MACOS /** * \def COMPILE_ON_MAC This flag will enable specific code for mac compilation */ |