mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-07 12:14:14 +02:00
ispyisail
fcd2a4e0e0
QET::splitWithSpaces() split on QRegularExpression("[^\\]?(?:\\\\)* ").
That is not a valid pattern: "[^\\]" opens a character class whose "\\]" is
an escaped bracket, so the class is never closed. QRegularExpression
reported isValid() == false, QString::split() warned "invalid
QRegularExpression object", and the function returned an EMPTY list for
every input.
It is the receiving half of the SingleApplication handshake: a secondary
instance sends "launched-with-args: " + joinWithSpaces(args) (main.cpp) and
the running instance parses it in QETApp::receiveMessage() before calling
openFiles(). With the split always empty, the running instance received no
arguments at all -- so opening a project while QET was already running
silently did nothing.
The bug is reported against filenames containing spaces, which is how it
was noticed, but it is not limited to them: plain names failed identically.
A corrected regex is not available. The separator is a space preceded by an
even-length run of backslashes, and PCRE2 has no variable-length lookbehind,
so the run cannot be expressed in a lookbehind and anything that matches it
by consumption eats the character before the space -- which is what the
"[^\\]?" was for. Scanning the string explicitly is correct and easier to
read.
tests/qttest/tst_qetstrings.cpp asserts the round trip
splitWithSpaces(joinWithSpaces(x)) == x over plain names, embedded spaces,
embedded backslashes, a trailing backslash and a mixture, plus the specific
regression that a plain argument list does not come back empty.
Verified the test fails without the fix: 9 of 11 cases fail on the old
implementation and all 11 pass with it. Full suite 5/5, Qt 5.15.18.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
116 lines
3.8 KiB
CMake
116 lines
3.8 KiB
CMake
# Copyright 2006 The QElectroTech Team
|
|
# This file is part of QElectroTech.
|
|
#
|
|
# QElectroTech is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# QElectroTech is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
cmake_minimum_required(VERSION 3.5)
|
|
|
|
message("..___________________________________________________________________")
|
|
|
|
project(qt_unittests LANGUAGES CXX)
|
|
|
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
|
|
set(CMAKE_AUTOMOC ON)
|
|
set(CMAKE_AUTORCC ON)
|
|
set(CMAKE_AUTOUIC ON)
|
|
|
|
SET(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
message(".. PROJECT_NAME :" ${PROJECT_NAME})
|
|
message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR})
|
|
if(NOT DEFINED QET_DIR)
|
|
set(QET_DIR "../..")
|
|
message(".. QET_DIR is not set, assuming QET is ../..")
|
|
endif()
|
|
message(".. QET_DIR :" ${QET_DIR})
|
|
if(NOT DEFINED QET_COMPONENTS)
|
|
message(".. QET_COMPONENTS is not set !!! I set them up !!!")
|
|
include(../../cmake/qet_compilation_vars.cmake)
|
|
endif()
|
|
if(NOT DEFINED QT_VERSION_MAJOR)
|
|
find_package(
|
|
QT
|
|
NAMES
|
|
Qt6
|
|
Qt5
|
|
COMPONENTS
|
|
${QET_COMPONENTS}
|
|
Test
|
|
REQUIRED
|
|
)
|
|
endif()
|
|
message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR})
|
|
|
|
find_package(
|
|
Qt${QT_VERSION_MAJOR}
|
|
COMPONENTS
|
|
${QET_COMPONENTS}
|
|
Test
|
|
REQUIRED)
|
|
|
|
include(../../cmake/fetch_kdeaddons.cmake)
|
|
include(../../cmake/fetch_singleapplication.cmake)
|
|
include(../../cmake/fetch_pugixml.cmake)
|
|
|
|
enable_testing()
|
|
|
|
add_executable(${PROJECT_NAME} tst_mytest.cpp)
|
|
add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
|
|
|
|
target_link_libraries(
|
|
${PROJECT_NAME}
|
|
PRIVATE
|
|
Qt::Test
|
|
${KF_PRIVATE_LIBRARIES}
|
|
${QET_PRIVATE_LIBRARIES})
|
|
|
|
# diagramsortkeys.h is a header-only helper (no QET link deps needed
|
|
# beyond Qt itself), so this test builds independently of the rest of
|
|
# the QET sources.
|
|
add_executable(tst_diagramsortkeys tst_diagramsortkeys.cpp)
|
|
add_test(NAME tst_diagramsortkeys COMMAND tst_diagramsortkeys)
|
|
target_include_directories(tst_diagramsortkeys PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_diagramsortkeys PRIVATE Qt::Test)
|
|
|
|
# contactusage.h is a header-only helper holding the contact counting
|
|
# rules, so this test builds independently of the rest of the QET sources.
|
|
add_executable(tst_contactusage tst_contactusage.cpp)
|
|
add_test(NAME tst_contactusage COMMAND tst_contactusage)
|
|
target_include_directories(tst_contactusage PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_contactusage PRIVATE Qt::Test)
|
|
|
|
add_executable(
|
|
tst_smart_device
|
|
tst_smart_device.cpp
|
|
${QET_DIR}/sources/bomexport.cpp
|
|
${QET_DIR}/sources/bomexport.h)
|
|
add_test(NAME tst_smart_device COMMAND tst_smart_device)
|
|
target_include_directories(tst_smart_device PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_smart_device PRIVATE Qt::Test Qt::Sql)
|
|
|
|
# qet.cpp carries the SingleApplication argument wire format
|
|
# (joinWithSpaces/splitWithSpaces); it pulls in qeticons and shortcutmanager,
|
|
# so those are compiled alongside rather than linking the whole application.
|
|
add_executable(
|
|
tst_qetstrings
|
|
tst_qetstrings.cpp
|
|
${QET_DIR}/sources/qet.cpp
|
|
${QET_DIR}/sources/qeticons.cpp
|
|
${QET_DIR}/sources/shortcutmanager.cpp)
|
|
add_test(NAME tst_qetstrings COMMAND tst_qetstrings)
|
|
target_include_directories(tst_qetstrings PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_qetstrings PRIVATE Qt::Test Qt::Widgets Qt::Xml)
|