diff options
33 files changed, 541 insertions, 11 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 2419a01332..d91807c342 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -47,6 +47,9 @@ #include <QtCore/qoperatingsystemversion.h> #include <QtCore/private/qcore_unix_p.h> #include <QtCore/qvarlengtharray.h> +#ifndef QT_BOOTSTRAPPED +# include <QtCore/qstandardpaths.h> +#endif // QT_BOOTSTRAPPED #include <pwd.h> #include <stdlib.h> // for realpath() @@ -1212,6 +1215,7 @@ static QString freeDesktopTrashLocation(const QString &sourcePath) | QFileDevice::WriteOwner | QFileDevice::ExeOwner; QString targetDir = topDir.filePath(trashDir); + // deliberately not using mkpath, since we want to fail if topDir doesn't exist if (topDir.mkdir(trashDir)) QFile::setPermissions(targetDir, ownerPerms); if (QFileInfo(targetDir).isDir()) @@ -1227,11 +1231,11 @@ static QString freeDesktopTrashLocation(const QString &sourcePath) }; QString trash; - const QLatin1String dotTrash(".Trash"); const QStorageInfo sourceStorage(sourcePath); const QStorageInfo homeStorage(QDir::home()); // We support trashing of files outside the users home partition if (sourceStorage != homeStorage) { + const QLatin1String dotTrash(".Trash"); QDir topDir(sourceStorage.rootPath()); /* Method 1: @@ -1288,13 +1292,17 @@ static QString freeDesktopTrashLocation(const QString &sourcePath) file into the user's “home trash” or refuse to trash it." We trash the file into the user's home trash. + + "Its name and location are $XDG_DATA_HOME/Trash"; $XDG_DATA_HOME is what + QStandardPaths returns for GenericDataLocation. If that doesn't exist, then + we are not running on a freedesktop.org-compliant environment, and give up. */ if (trash.isEmpty()) { - QDir topDir = QDir::home(); - trash = makeTrashDir(topDir, dotTrash); + QDir topDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + trash = makeTrashDir(topDir, QLatin1String("Trash")); if (!QFileInfo(trash).isDir()) { - qWarning("Unable to establish trash directory %s in %s", - dotTrash.latin1(), topDir.path().toLocal8Bit().constData()); + qWarning("Unable to establish trash directory in %s", + topDir.path().toLocal8Bit().constData()); } } diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt index cb1246c3a2..9ec9da18c9 100644 --- a/tests/auto/corelib/io/CMakeLists.txt +++ b/tests/auto/corelib/io/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory(qdataurl) add_subdirectory(qdiriterator) add_subdirectory(qfile) add_subdirectory(largefile) -# add_subdirectory(qfileselector) # special case needs fixes +add_subdirectory(qfileselector) add_subdirectory(qfilesystemmetadata) add_subdirectory(qloggingcategory) add_subdirectory(qnodebug) @@ -40,7 +40,7 @@ if(TARGET Qt::Network) add_subdirectory(qiodevice) endif() if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID) - # add_subdirectory(qprocess) # special case needs fixes + add_subdirectory(qprocess) endif() if(QT_FEATURE_process) add_subdirectory(qprocess-noapplication) diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt index b976754629..cf329d37b7 100644 --- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt @@ -23,7 +23,7 @@ add_qt_test(tst_qfile tst_qfile.cpp INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index 03b648d76f..6bfb3fe8fd 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -23,7 +23,7 @@ add_qt_test(tst_qfile tst_qfile.cpp INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qfileselector/CMakeLists.txt b/tests/auto/corelib/io/qfileselector/CMakeLists.txt new file mode 100644 index 0000000000..67840c8112 --- /dev/null +++ b/tests/auto/corelib/io/qfileselector/CMakeLists.txt @@ -0,0 +1,71 @@ +# Generated from qfileselector.pro. + +##################################################################### +## tst_qfileselectors Test: +##################################################################### + +qt_add_test(tst_qfileselectors + SOURCES + tst_qfileselector.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate +) + +# Resources: +set(qfileselector_resource_files + "extras/+custom1/test" + "extras/+custom1/test3" + "extras/+custom2/test" + "extras/+custom3/+custom2/test" + "extras/+custom3/+custom4/test" + "extras/+custom3/+custom5/test" + "extras/+custom3/test" + "extras/+custom5/+custom3/test" + "extras/test" + "extras/test2" + "platforms/+android/test" + "platforms/+android/test2" + "platforms/+darwin/test" + "platforms/+haiku/test" + "platforms/+haiku/test2" + "platforms/+ios/test" + "platforms/+ios/test2" + "platforms/+linux/test" + "platforms/+linux/test2" + "platforms/+macos/test" + "platforms/+macos/test2" + "platforms/+qnx/test" + "platforms/+qnx/test2" + "platforms/+unix/+android/test" + "platforms/+unix/+darwin/+ios/test" + "platforms/+unix/+darwin/+macos/test" + "platforms/+unix/+darwin/test" + "platforms/+unix/+haiku/test" + "platforms/+unix/+linux/test" + "platforms/+unix/+qnx/test" + "platforms/+unix/test" + "platforms/+unix/test3" + "platforms/+wince/test" + "platforms/+wince/test2" + "platforms/+windows/+wince/test" + "platforms/+windows/+winnt/test" + "platforms/+windows/+winrt/test" + "platforms/+windows/test" + "platforms/+windows/test3" + "platforms/+winnt/test2" + "platforms/+winrt/test" + "platforms/+winrt/test2" + "platforms/test" + "platforms/test2" + "platforms/test3" + "platforms/test4" + "platforms/test5" +) + +qt_add_resource(tst_qfileselectors "qfileselector" + PREFIX + "/" + FILES + ${qfileselector_resource_files} +) + diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt index 52bd7bfd8f..a41c442b58 100644 --- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qlockfile SOURCES tst_qlockfile.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES Qt::Concurrent + Qt::CorePrivate ) ## Scopes: diff --git a/tests/auto/corelib/io/qprocess/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/.prev_CMakeLists.txt new file mode 100644 index 0000000000..a443c45ebc --- /dev/null +++ b/tests/auto/corelib/io/qprocess/.prev_CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from qprocess.pro. + +add_subdirectory(testProcessCrash) +add_subdirectory(testProcessEcho) +add_subdirectory(testProcessEcho2) +add_subdirectory(testProcessEcho3) +add_subdirectory(testProcessEnvironment) +add_subdirectory(testProcessHang) +add_subdirectory(testProcessNormal) +add_subdirectory(testProcessOutput) +add_subdirectory(testProcessDeadWhileReading) +add_subdirectory(testProcessEOF) +add_subdirectory(testExitCodes) +add_subdirectory(testForwarding) +add_subdirectory(testForwardingHelper) +add_subdirectory(testGuiProcess) +add_subdirectory(testDetached) +add_subdirectory(fileWriterProcess) +add_subdirectory(testSetWorkingDirectory) +add_subdirectory(testSoftExit) +add_subdirectory(testProcessSpacesArgs) +add_subdirectory(testSpaceInName) +add_subdirectory(test) +if(WIN32) + add_subdirectory(testProcessEchoGui) + add_subdirectory(testSetNamedPipeHandleState) +endif() diff --git a/tests/auto/corelib/io/qprocess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/CMakeLists.txt new file mode 100644 index 0000000000..3e91cc98d9 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from qprocess.pro. + +add_subdirectory(testProcessCrash) +add_subdirectory(testProcessEcho) +add_subdirectory(testProcessEcho2) +add_subdirectory(testProcessEcho3) +add_subdirectory(testProcessEnvironment) +add_subdirectory(testProcessHang) +add_subdirectory(testProcessNormal) +add_subdirectory(testProcessOutput) +add_subdirectory(testProcessDeadWhileReading) +add_subdirectory(testProcessEOF) +add_subdirectory(testExitCodes) +add_subdirectory(testForwarding) +add_subdirectory(testForwardingHelper) +# special case begin +if(TARGET Qt::Widgets) + add_subdirectory(testGuiProcess) +endif() +# special case end +add_subdirectory(testDetached) +add_subdirectory(fileWriterProcess) +add_subdirectory(testSetWorkingDirectory) +add_subdirectory(testSoftExit) +add_subdirectory(testProcessSpacesArgs) +add_subdirectory(testSpaceInName) +add_subdirectory(test) +if(WIN32) + add_subdirectory(testProcessEchoGui) + add_subdirectory(testSetNamedPipeHandleState) +endif() diff --git a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt new file mode 100644 index 0000000000..92b4c258dd --- /dev/null +++ b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from fileWriterProcess.pro. + +##################################################################### +## fileWriterProcess Binary: +##################################################################### + +qt_add_executable(fileWriterProcess + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp +) diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt new file mode 100644 index 0000000000..0541b4258a --- /dev/null +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -0,0 +1,29 @@ +# Generated from test.pro. + +##################################################################### +## tst_qprocess Test: +##################################################################### + +qt_add_test(tst_qprocess + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + SOURCES + ../../../../../shared/emulationdetector.h + ../tst_qprocess.cpp + INCLUDE_DIRECTORIES + ../../../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Network +) + +#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: +# TEST_HELPER_INSTALLS = "../testProcessSpacesArgs/nospace" "../testProcessSpacesArgs/one space" "../testProcessSpacesArgs/two space s" "../test Space In Name/testSpaceInName" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:test.pro:WIN32: +# TESTDATA = "../testBatFiles/*" + +#### Keys ignored in scope 5:.:..:../qprocess.pri:NOT TARGET Qt::Widgets: +# SUBPROGRAMS = "-testGuiProcess" diff --git a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt new file mode 100644 index 0000000000..a7f9b9412d --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from testDetached.pro. + +##################################################################### +## testDetached Binary: +##################################################################### + +qt_add_executable(testDetached + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp +) diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt new file mode 100644 index 0000000000..cf3f6f4e64 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testExitCodes.pro. + +##################################################################### +## testExitCodes Binary: +##################################################################### + +qt_add_executable(testExitCodes + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt new file mode 100644 index 0000000000..83658e4b7a --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from testForwarding.pro. + +##################################################################### +## testForwarding Binary: +##################################################################### + +qt_add_executable(testForwarding + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp +) diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt new file mode 100644 index 0000000000..9197f96e10 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testForwardingHelper.pro. + +##################################################################### +## testForwardingHelper Binary: +##################################################################### + +qt_add_executable(testForwardingHelper + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt new file mode 100644 index 0000000000..bd6853c438 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from testGuiProcess.pro. + +##################################################################### +## testGuiProcess Binary: +##################################################################### + +qt_add_executable(testGuiProcess + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt new file mode 100644 index 0000000000..d09e1364fb --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessCrash.pro. + +##################################################################### +## testProcessCrash Binary: +##################################################################### + +qt_add_executable(testProcessCrash + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt new file mode 100644 index 0000000000..aade19fa91 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessDeadWhileReading.pro. + +##################################################################### +## testProcessDeadWhileReading Binary: +##################################################################### + +qt_add_executable(testProcessDeadWhileReading + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt new file mode 100644 index 0000000000..7fe205c5d4 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessEOF.pro. + +##################################################################### +## testProcessEOF Binary: +##################################################################### + +qt_add_executable(testProcessEOF + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt new file mode 100644 index 0000000000..0db956d16c --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessEcho.pro. + +##################################################################### +## testProcessEcho Binary: +##################################################################### + +qt_add_executable(testProcessEcho + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt new file mode 100644 index 0000000000..abe80a3cff --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessEcho2.pro. + +##################################################################### +## testProcessEcho2 Binary: +##################################################################### + +qt_add_executable(testProcessEcho2 + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt new file mode 100644 index 0000000000..8b7a8b3a51 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessEcho3.pro. + +##################################################################### +## testProcessEcho3 Binary: +##################################################################### + +qt_add_executable(testProcessEcho3 + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt new file mode 100644 index 0000000000..a2e3c6a0a9 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from testProcessEchoGui.pro. + +##################################################################### +## testProcessEchoGui Binary: +##################################################################### + +qt_add_executable(testProcessEchoGui + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) + +## Scopes: +##################################################################### + +qt_extend_target(testProcessEchoGui CONDITION WIN32 + SOURCES + main_win.cpp + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt new file mode 100644 index 0000000000..ca529c0c84 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from testProcessEchoGui.pro. + +##################################################################### +## testProcessEchoGui Binary: +##################################################################### + +qt_add_executable(testProcessEchoGui + GUI # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) + +## Scopes: +##################################################################### + +qt_extend_target(testProcessEchoGui CONDITION WIN32 + SOURCES + main_win.cpp + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt new file mode 100644 index 0000000000..63d7767b60 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessEnvironment.pro. + +##################################################################### +## testProcessEnvironment Binary: +##################################################################### + +qt_add_executable(testProcessEnvironment + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt new file mode 100644 index 0000000000..77e39937b0 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testProcessHang.pro. + +##################################################################### +## testProcessHang Binary: +##################################################################### + +qt_add_executable(testProcessHang + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt new file mode 100644 index 0000000000..2348a4b002 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from testProcessNormal.pro. + +##################################################################### +## testProcessNormal Binary: +##################################################################### + +qt_add_executable(testProcessNormal + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp +) diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt new file mode 100644 index 0000000000..4e0b835aa1 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from testProcessOutput.pro. + +##################################################################### +## testProcessOutput Binary: +##################################################################### + +qt_add_executable(testProcessOutput + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp +) diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f8a21c990d --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from nospace.pro. + +##################################################################### +## nospace Binary: +##################################################################### + +qt_add_executable(nospace + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:nospace.pro:<TRUE>: +# OBJECTS_DIR = "$${OBJECTS_DIR}-nospace" diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt new file mode 100644 index 0000000000..8512c7545b --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from nospace.pro. + +##################################################################### +## nospace Binary: +##################################################################### + +qt_add_executable(nospace + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) + +# special case begin +qt_add_executable(onespace + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) +set_target_properties(onespace PROPERTIES OUTPUT_NAME "one space") + +qt_add_executable(twospaces + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) +set_target_properties(twospaces PROPERTIES OUTPUT_NAME "two space s") +# special case end + +#### Keys ignored in scope 1:.:.:nospace.pro:<TRUE>: +# OBJECTS_DIR = "$${OBJECTS_DIR}-nospace" diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt new file mode 100644 index 0000000000..9fc7528b2e --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testSetNamedPipeHandleState.pro. + +##################################################################### +## testSetNamedPipeHandleState Binary: +##################################################################### + +qt_add_executable(testSetNamedPipeHandleState + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt new file mode 100644 index 0000000000..54a8b1b4d1 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from testSetWorkingDirectory.pro. + +##################################################################### +## testSetWorkingDirectory Binary: +##################################################################### + +qt_add_executable(testSetWorkingDirectory + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp +) diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt new file mode 100644 index 0000000000..ec2d9433b2 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from testSoftExit.pro. + +##################################################################### +## testSoftExit Binary: +##################################################################### + +qt_add_executable(testSoftExit + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" +) + +## Scopes: +##################################################################### + +qt_extend_target(testSoftExit CONDITION WIN32 + SOURCES + main_win.cpp + PUBLIC_LIBRARIES + user32 +) + +qt_extend_target(testSoftExit CONDITION UNIX + SOURCES + main_unix.cpp +) diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt new file mode 100644 index 0000000000..1ca31c59df --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from testSpaceInName.pro. + +##################################################################### +## testSpaceInName Binary: +##################################################################### + +qt_add_executable(testSpaceInName + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../test Space In Name" + SOURCES + main.cpp +) |