Stop using Quotient_ENABLE_E2EE

.github/workflows/ci.yml

@@ -119,7 +119,6 @@ jobs:
         echo "CMAKE_ARGS=-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
               ${{ runner.os != 'Linux' && '-DCMAKE_MAKE_PROGRAM=$IQTA_TOOLS/Ninja/ninja' || '' }} \
               -DCMAKE_PREFIX_PATH=~/.local \
-              -DQuotient_ENABLE_E2EE=ON \
               ${{ runner.os == 'macOS' && '-DOPENSSL_ROOT_DIR=`brew --prefix openssl`' ||
                   runner.os == 'Windows' && '-DOPENSSL_ROOT_DIR=$IQTA_TOOLS/OpenSSLv3/Win_x64/' || '' }} \
               -DBUILD_SHARED_LIBS=${{ matrix.composition == 'dynamic' }} \

BUILDING.md

@@ -162,14 +162,6 @@ Noteworthy CMake variables that you can use:
 - `-DBUILD_WITH_QT6=<ON|OFF>` - selects the target Qt major version. By default
   it's `ON` (Qt 6 is preferred); set it to `OFF` to build with Qt 5 (which is
   generally discouraged; Quaternion 0.0.96 is the last release to support it).
-- `-DQuotient_ENABLE_E2EE=<ON|OFF>` - for compiling with/without E2EE support.
-  Normally you don't need to touch this variable; setting it has no effect when
-  you compile with external libQuotient, and it is `ON` by default when building
-  Quaternion with in-tree libQuotient. The only reason you would want to turn it
-  off is when you can't provide the dependencies needed for E2EE: libolm and
-  OpenSSL. Even if E2EE support is switched on, you still have to explicitly
-  tick the E2EE box whenever you log in to each account; when E2EE support is
-  off there will be no E2EE box at all.
 
 ### Install
 In the root directory of the project sources: `cmake --build build_dir --target install`.

CMakeLists.txt

@@ -101,7 +101,6 @@ endif()
 set(QUOTIENT_FORCE_NAMESPACED_INCLUDES 1)
 if ((NOT DEFINED USE_INTREE_LIBQMC OR USE_INTREE_LIBQMC)
         AND EXISTS ${PROJECT_SOURCE_DIR}/lib/Quotient/util.h)
-    option(Quotient_ENABLE_E2EE "end-to-end-encryption (E2EE) support (BETA)" ON)
     add_subdirectory(lib)
     if (NOT DEFINED USE_INTREE_LIBQMC)
         set (USE_INTREE_LIBQMC 1)
@@ -228,7 +227,7 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
     ${quaternion_SRCS} ${quaternion_QM}
     ${quaternion_WINRC} ${${PROJECT_NAME}_MAC_ICON})
 
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_23)
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
     GIT_SHA1="${GIT_SHA1}" LIB_GIT_SHA1="${LIB_GIT_SHA1}")
@@ -240,7 +239,7 @@ target_link_libraries(${PROJECT_NAME} ${QUOTIENT}
     ${Qt}::Widgets ${Qt}::Quick ${Qt}::Qml ${Qt}::Gui ${Qt}::Network ${Qt}::QuickControls2 ${Qt}::QuickWidgets)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
-    CXX_STANDARD 20
+    CXX_STANDARD 23
     CXX_EXTENSIONS OFF
     VISIBILITY_INLINES_HIDDEN ON
     CXX_VISIBILITY_PRESET hidden

flatpak/com.github.quaternion.yaml

@@ -62,5 +62,4 @@ modules:
     path: "../"
   config-opts:
   - -DQuotient_INSTALL_TESTS=OFF
-  - -DQuotient_ENABLE_E2EE=ON
   - -DBUILD_SHARED_LIBS=OFF