Merge branch 'master' into qt6_cmake_joshua

qelectrotech.pro

@@ -171,7 +171,9 @@ HEADERS += $$files(sources/*.h) \
            $$files(sources/xml/*.h) \
            $$files(sources/dxf/*.h) \
            $$files(sources/qet_elementscaler/*.h) \
-           $$files(sources/svg/*.h)
+           $$files(sources/svg/*.h) \
+           $$files(sources/import/edz/*.h) \
+           $$files(sources/import/edz/lzma/*.h)
 
 SOURCES += $$files(sources/*.cpp) \
            $$files(sources/editor/*.cpp) \
@@ -215,11 +217,17 @@ SOURCES += $$files(sources/*.cpp) \
            $$files(sources/xml/*.cpp) \
            $$files(sources/dxf/*.cpp) \
            $$files(sources/qet_elementscaler/*.cpp) \
-           $$files(sources/svg/*.cpp)
+           $$files(sources/svg/*.cpp) \
+           $$files(sources/import/edz/*.cpp) \
+           $$files(sources/import/edz/lzma/*.c)
 
 # Needed for use promote QTreeWidget in terminalstripeditor.ui
 INCLUDEPATH += sources/TerminalStrip/ui
 
+# Needed for the EPLAN .edz importer (PR #513) and its bundled lzma/7z sources
+INCLUDEPATH += sources/import/edz
+INCLUDEPATH += sources/import/edz/lzma
+
 # Liste des fichiers qui seront incorpores au binaire en tant que ressources Qt
 RESOURCES += qelectrotech.qrc
 
@@ -230,7 +238,30 @@ RESOURCES += qelectrotech.qrc
 TRANSLATIONS += lang/*.ts
 
 # Modules Qt utilises par l'application
-QT += xml svg network sql widgets printsupport concurrent KWidgetsAddons KCoreAddons
+QT += xml svg network sql widgets printsupport concurrent gui-private
+
+# KDE Frameworks 5 (KWidgetsAddons, KCoreAddons) are optional.
+#
+# Pass CONFIG+=no_kf5 to qmake to build against the Qt-only replacements in
+# sources/ui/nokde instead. This mirrors the CMake option BUILD_WITH_KF5=OFF
+# and is the easiest route on Windows/MinGW, where KF5 is awkward to obtain.
+#
+#     qmake CONFIG+=no_kf5 qelectrotech.pro
+#
+# sources/ui/nokde is only added to the include path in that configuration, so
+# a normal KF5 build is unaffected.
+no_kf5 {
+    DEFINES     += BUILD_WITHOUT_KF5
+    INCLUDEPATH += sources/ui/nokde
+    HEADERS     += $$files(sources/ui/nokde/*.h)
+    SOURCES     += $$files(sources/ui/nokde/*.cpp)
+} else {
+    QT += KWidgetsAddons KCoreAddons
+}
+
+# Private Qt GUI headers (needed for QPdfEngine::drawHyperlink)
+# gui-private should add this automatically, but some distros need it explicit
+INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtGui/$$[QT_VERSION]/QtGui
 
 # UI DESIGNER FILES AND GENERATION SOURCES FILES
 FORMS += $$files(sources/richtext/*.ui) \