From ed3c8f1f76cfd51b689ee43d1a79702de1aefc37 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Wed, 27 May 2015 12:56:47 +0200 Subject: [PATCH 1/8] Escaped a special character in the XML file Without it, Qt creator complains that the XML file is invalid and it could not be parsed. Made a language edit as well based on the sanity bot's recommendation. Change-Id: I04acd60d9ee4f5f29f443fa56beed6ecfbdbef64 Task-number: QTBUG-41996 Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen --- share/qtcreator/welcomescreen/qtcreator_tutorials.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml index cc4ad211a96..03a4466a5a0 100644 --- a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml +++ b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml @@ -105,7 +105,7 @@ qt quick,qt creator,qml profiler - + qt,3d From cdc76fccaf5d8e76f0ddcbb76cd66029a9a5d8f5 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 28 May 2015 10:25:20 +0200 Subject: [PATCH 2/8] Help: Fix that user registered documentation was auto-removed on windows We may not use native path separators for internal data. Task-number: QTCREATORBUG-14249 Change-Id: I0f00db235608e81cfefdd2359378020c7376768f Reviewed-by: Alessandro Portale --- src/plugins/help/docsettingspage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index a1d3eff3c72..2de972a2ff4 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -103,7 +103,7 @@ void DocSettingsPage::addDocumentation() } addItem(nameSpace, file, true/*user managed*/); - m_filesToRegister.insert(nameSpace, QDir::toNativeSeparators(filePath)); + m_filesToRegister.insert(nameSpace, filePath); m_filesToRegisterUserManaged.insert(nameSpace, true/*user managed*/); // If the files to unregister contains the namespace, grab a copy of all paths added and try to From 29d81424a2e5387591582f4d4a8af994cde9eb77 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 28 May 2015 16:13:19 +0200 Subject: [PATCH 3/8] More changes Change-Id: I38a0c5cef0f22e1b7eda218c3992fcecfe728455 Reviewed-by: Leena Miettinen --- dist/changes-3.4.1.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dist/changes-3.4.1.md b/dist/changes-3.4.1.md index 195bd519a95..e43e323c32a 100644 --- a/dist/changes-3.4.1.md +++ b/dist/changes-3.4.1.md @@ -19,6 +19,11 @@ Editing * Fixed that the completion popup could become huge (QTCREATORBUG-14331) +Help + +* Fixed that manually registered documentation vanished on restart + on Windows (QTCREATORBUG-14249) + Project Management * Fixed adding static libraries with `Add Library` wizard @@ -54,6 +59,8 @@ C++ Support QML Support * Fixed completion for QtQml and QtQml.Models (QTCREATORBUG-13780) +* Fixed that dragging items from QML overview onto editor removed the + items (QTCREATORBUG-14496) Platform Specific From 0879785839f195c9f90ae6196e022a5072d623a3 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 28 May 2015 17:48:49 +0200 Subject: [PATCH 4/8] RemoteLinux: Fix upload for target file paths with spaces. In addition to causing an unhelpful error message, we would also create directories at unwanted places. For instance, deploying to a directory called "/tmp/test dir" would result in this: mkdir -p /tmp/test dir Which created two unwanted directories, one of them at a completely unrelated place. Task-number: QTCREATORBUG-14518 Change-Id: Ie1c287ca73d0815b9bed335141adb901e361e3e6 Reviewed-by: Eike Ziller Reviewed-by: Karsten Sperling Opdal Reviewed-by: Christian Kandeler --- .../remotelinux/genericdirectuploadservice.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index dd9d1f93a7d..a5852ade3a8 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -184,7 +185,8 @@ void GenericDirectUploadService::handleUploadFinished(SftpJobId jobId, const QSt // This is done for Windows. if (df.isExecutable()) { - const QString command = QLatin1String("chmod a+x ") + df.remoteFilePath(); + const QString command = QLatin1String("chmod a+x ") + + Utils::QtcProcess::quoteArgUnix(df.remoteFilePath()); d->chmodProc = connection()->createRemoteProcess(command.toUtf8()); connect(d->chmodProc.data(), SIGNAL(closed(int)), SLOT(handleChmodFinished(int))); connect(d->chmodProc.data(), SIGNAL(readyReadStandardOutput()), @@ -263,8 +265,9 @@ void GenericDirectUploadService::handleMkdirFinished(int exitStatus) const QString remoteFilePath = df.remoteDirectory() + QLatin1Char('/') + fi.fileName(); if (fi.isSymLink()) { const QString target = fi.dir().relativeFilePath(fi.symLinkTarget()); // see QTBUG-5817. - const QString command = QLatin1String("ln -sf ") + target + QLatin1Char(' ') - + remoteFilePath; + const QStringList args = QStringList() << QLatin1String("ln") << QLatin1String("-sf") + << target << remoteFilePath; + const QString command = Utils::QtcProcess::joinArgs(args, Utils::OsTypeLinux); // See comment in SftpChannel::createLink as to why we can't use it. d->lnProc = connection()->createRemoteProcess(command.toUtf8()); @@ -370,7 +373,8 @@ void GenericDirectUploadService::uploadNextFile() QFileInfo fi = df.localFilePath().toFileInfo(); if (fi.isDir()) dirToCreate += QLatin1Char('/') + fi.fileName(); - const QString command = QLatin1String("mkdir -p ") + dirToCreate; + const QString command = QLatin1String("mkdir -p ") + + Utils::QtcProcess::quoteArgUnix(dirToCreate); d->mkdirProc = connection()->createRemoteProcess(command.toUtf8()); connect(d->mkdirProc.data(), SIGNAL(closed(int)), SLOT(handleMkdirFinished(int))); connect(d->mkdirProc.data(), SIGNAL(readyReadStandardOutput()), SLOT(handleStdOutData())); From a8cdf035ac0b8583543760e64b6a2a09787e14e4 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 28 May 2015 18:20:53 +0200 Subject: [PATCH 5/8] Squish: Update to changed behavior when renaming The bugreport I wrote about this was rated invalid so now this is the expected behavior. Change-Id: Ia187062552ad9d4857b5078d4c9c5dde4c8b7521 Task-number: QTCREATORBUG-14469 Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_rename_file/test.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 25fa7c48fd6..5de12b43625 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -55,12 +55,7 @@ def main(): previous = filenames[-1] for filename in filenames: tempFiletype = filetype - if previous in ("test", "TEST"): - if tempFiletype in ("Headers", "Sources", "QML"): - tempFiletype = "Sources" - else: # then it must be Resources - tempFiletype = "Other files" - elif filetype == "QML" and previous[-4:] != ".qml": + if previous in ("test", "TEST") or filetype == "QML" and previous[-4:] != ".qml": tempFiletype = "Other files" renameFile(templateDir, usedProFile, projectName + "." + tempFiletype, previous, filename) From c7b7fde2bf1dc4d60e248c63368fb43154b0455b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 29 May 2015 11:54:25 +0200 Subject: [PATCH 6/8] Squish: Fix verification in tst_rename_file This doesn't change anything until we replace the used project. main.cpp or utility.cpp may get the tempFiletype "Headers" and then the test will crash because the file can't be opened. In addition, only files with filetype "Headers" are included in other files, so verifying including of other files is pointless. Change-Id: I30b20269a800eca5ef51de3af209e674da5189bd Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_rename_file/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 5de12b43625..35ada7a94e3 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -61,7 +61,7 @@ def main(): previous, filename) # QTCREATORBUG-13176 does update the navigator async progressBarWait() - if tempFiletype == "Headers": # QTCREATORBUG-13204 + if filetype == "Headers": # QTCREATORBUG-13204 verifyRenamedIncludes(templateDir, "main.cpp", previous, filename) verifyRenamedIncludes(templateDir, "utility.cpp", previous, filename) previous = filename From 3627f311f3a7dac92ad0aba149c1a1b207885db4 Mon Sep 17 00:00:00 2001 From: "M. Moellney" Date: Sat, 30 May 2015 00:00:01 +0200 Subject: [PATCH 7/8] Add profile completion keyword VERSION_PE_HEADER qmake of Qt 5.5 introduces a new predefined variable VERSION_PE_HEADER. It was not part of the known keywords for the qmake profile editor. This patch adds VERSION_PE_HEADER. Change-Id: Iae671d89ff623c4062da621e571769df736fa6d3 Reviewed-by: Oswald Buddenhagen --- src/plugins/qmakeprojectmanager/profilecompletionassist.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp index d83a5d5fc1c..36407376d4f 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp +++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp @@ -225,6 +225,7 @@ static const char *const variableKeywords[] = { "UI_HEADERS_DIR", "UI_SOURCES_DIR", "VERSION", + "VERSION_PE_HEADER", "VER_MAJ", "VER_MIN", "VER_PAT", From e869d794c8f3f6c8e4d36199e8b9bfb5fdab0d47 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 1 Jun 2015 22:34:30 +0200 Subject: [PATCH 8/8] Revert "Squish: Fix verification in tst_rename_file" Didn't think of the bug mentioned in my own comment. Sorry. This reverts commit c7b7fde2bf1dc4d60e248c63368fb43154b0455b. Change-Id: Ida2791a7c985c8036194df437c720a170a39458e Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_rename_file/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 35ada7a94e3..5de12b43625 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -61,7 +61,7 @@ def main(): previous, filename) # QTCREATORBUG-13176 does update the navigator async progressBarWait() - if filetype == "Headers": # QTCREATORBUG-13204 + if tempFiletype == "Headers": # QTCREATORBUG-13204 verifyRenamedIncludes(templateDir, "main.cpp", previous, filename) verifyRenamedIncludes(templateDir, "utility.cpp", previous, filename) previous = filename