Merge pull request #834 from ispyisail/fix/qlabel-pixmap-deprecation

Use QLabel::pixmap()'s non-deprecated by-value form on Qt5
2026-09-22 17:34:14 +02:00 · 2026-09-10 16:51:55 +12:00 · 2026-09-10 16:50:49 +12:00 · 2026-09-10 05:27:57 +02:00 · 2026-09-10 05:24:31 +02:00 · 2026-09-10 02:33:31 +02:00
4 changed files with 9 additions and 6 deletions
@@ -19,7 +19,7 @@ include(cmake/hoto_update_cmake_message.cmake)
 cmake_minimum_required(VERSION 3.5...4.2)

 project(qelectrotech
-        VERSION 0.100.1
+        VERSION 0.200.1
        DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
        HOMEPAGE_URL "https://qelectrotech.org/"
        LANGUAGES C CXX)
@@ -36,7 +36,7 @@ set(QET_DIR ${PROJECT_SOURCE_DIR})
 # includes below, so every subdirectory and every FetchContent dependency
 # sees a consistent, already-defined value.
 if(NOT DEFINED QT_VERSION_MAJOR)
-    set(QT_VERSION_MAJOR 5)
+    set(QT_VERSION_MAJOR 6)
 endif()

 # Some third-party CMake projects we pull in via FetchContent (e.g.
@@ -48,7 +48,7 @@ PROJECT_NAME           = QElectroTech
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = " 0.100.0-dev"
+PROJECT_NUMBER         = " 0.200.1-dev"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -48,8 +48,8 @@ Here are the technical choices made for the software development:
 *   Coding language: [C++](https://en.wikipedia.org/wiki/C%2B%2B)
 *   GUI translations: [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html)
 *   Version control: [GIT](https://github.com/qelectrotech/qelectrotech-source-mirror.git)
-*   Doxygen documentation :[Doxygen](https://qelectrotech.github.io/qelectrotech-source-mirror/)
-*   QtCreator qch doxygen :[QElectroTech.qch](https://github.com/qelectrotech/qelectrotech-source-mirror/blob/master/doc/QElectroTech.qch)
+*   Doxygen documentation :[Doxygen](https://download.qelectrotech.org/qet/doxygen/html/)
+*   QtCreator qch doxygen :[QElectroTech.qch](https://download.qelectrotech.org/qet/doxygen/QElectroTech.qch)
 *   File format for projects, elements and titleblocks: [XML](http://www.w3schools.com/xml/xml_whatis.asp)
 *   Main development platform: [GNU/Linux](http://getgnulinux.org/en/linux/)
 *   Targeted platforms: Windows, GNU/Linux, Mac OS X, BSDs
@@ -66,8 +66,11 @@ ClickableImageLabel::ClickableImageLabel(const QImage &sourceImage, QWidget *par
 void ClickableImageLabel::mousePressEvent(QMouseEvent *event)
 {
 		// QLabel::pixmap() returns a pointer in Qt5 and a value in Qt6.
+		// Qt 5.15 offers the by-value form behind Qt::ReturnByValue; the
+		// pointer overload is deprecated there, so take the by-value one
+		// on both and the difference reduces to the argument.
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	const QPixmap label_pixmap = pixmap() ? *pixmap() : QPixmap();
+	const QPixmap label_pixmap = pixmap(Qt::ReturnByValue);
 #else
 	const QPixmap label_pixmap = pixmap();
 #endif
Author	SHA1	Message	Date
ispyisail	1a12d440b2	Merge pull request #834 from ispyisail/fix/qlabel-pixmap-deprecation Use QLabel::pixmap()'s non-deprecated by-value form on Qt5	2026-09-10 16:51:55 +12:00
ispyisail	85f46f2b48	Use QLabel::pixmap()'s non-deprecated by-value form on Qt5 #824 read the pixmap through the pointer overload, which Qt 5.15 deprecates, so the fix it introduced compiled with two deprecation warnings of its own. Qt 5.15 offers the by-value form behind Qt::ReturnByValue, so both branches can take the same overload and the difference reduces to the argument. Equivalent: the pointer overload returns nullptr when no pixmap is set, which the old expression turned into a null QPixmap; pixmap( Qt::ReturnByValue) returns a null QPixmap directly. It also drops the null check, so the Qt5 branch is now a single expression. Verified both arms of the #if, since a preprocessor-branched change is only half tested otherwise: - Qt 5.15.18: deprecation warnings for this file 2 -> 0, builds clean, binary runs - Qt 6.10.2: builds clean, 488/488, links - 22 example projects load and export with no crash or hang Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-10 16:50:49 +12:00
Laurent Trinques	9637420756	Update Links to Doygen documentation and qch file	2026-09-10 05:27:57 +02:00
Laurent Trinques	6c68c461b1	Set Doxyfile version to 0.200.1	2026-09-10 05:24:31 +02:00
Laurent Trinques	c830101ba6	Update CMakeLists.txt set version to 0.200.1	2026-09-10 02:33:31 +02:00
Laurent Trinques	a1c0907811	Set QT_VERSION_MAJOR to 6 https://github.com/qelectrotech/qelectrotech-source-mirror/pull/824#issuecomment-5610090520	2026-09-10 02:30:53 +02:00