From 326d40dde1c6267cda6fa76949c9506f33cd703e Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 20 Jan 2017 12:20:00 +0100 Subject: [PATCH 1/9] Squish: Parse qtcreator.pro with Qt 5.6 to avoid changing results Change-Id: I47cecb8ac8aaf1d5a845b801ff4038b3f023a220 Task-number: QTCREATORBUG-17577 Task-number: QTCREATORBUG-17609 Reviewed-by: Christian Stenger --- .../system/suite_general/tst_openqt_creator/test.py | 13 ++++++++----- .../testdata/projecttree_creator.tsv | 10 ---------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py index 10ec71744cd..5722a3fe46c 100644 --- a/tests/system/suite_general/tst_openqt_creator/test.py +++ b/tests/system/suite_general/tst_openqt_creator/test.py @@ -41,7 +41,7 @@ def main(): waitFor("runButton.enabled", 30000) # Starting before opening, because this is where Creator froze (QTCREATORBUG-10733) startopening = datetime.utcnow() - openQmakeProject(pathCreator, Targets.DESKTOP_531_DEFAULT) + openQmakeProject(pathCreator, Targets.DESKTOP_561_DEFAULT) # Wait for parsing to complete startreading = datetime.utcnow() waitFor("runButton.enabled", 300000) @@ -62,12 +62,15 @@ def main(): if not test.verify(object.exists(":Qt Creator_Core::OutputWindow"), "Did the General Messages view show up?"): openGeneralMessages() + # Verify messages appear once, from using default kit before configuring generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) - test.verify("Project MESSAGE: Cannot build Qt Creator with Qt version 5.3.1." in generalMessages, - "Warning about outdated Qt shown?") - test.verify("Project ERROR: Use at least Qt 5.5.0." in generalMessages, - "Minimum Qt version shown?") + test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.3.1."), 1, + "Warning about outdated Qt shown?") + test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.5.0."), 1, + "Minimum Qt version shown?") + # Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609) + selectFromLocator("p qmljs.g", "qmljs.g") # Now check some basic lookups in the search box selectFromLocator(": Qlist::QList", "QList::QList") test.compare(wordUnderCursor(waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")), "QList") diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv index d3a824e96fa..d25452c942a 100644 --- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv @@ -2683,8 +2683,6 @@ "qmljsgrammar.cpp" "6" "qmljslexer.cpp" "6" "qmljsparser.cpp" "6" -"Other files" "5" -"qmljs.g" "6" "Headers" "4" "jsoncheck.h" "5" "persistenttrie.h" "5" @@ -2760,9 +2758,6 @@ "qmljsutils.cpp" "5" "qmljsvalueowner.cpp" "5" "qmljsviewercontext.cpp" "5" -"Other files" "4" -"parser" "5" -"qmljs.g" "6" "qtcreatorlibrary" "3" "qtcreatorlibrary.pri" "4" "qmljs_dependencies" "4" @@ -13819,8 +13814,6 @@ "qmljsgrammar.cpp" "8" "qmljslexer.cpp" "8" "qmljsparser.cpp" "8" -"Other files" "7" -"qmljs.g" "8" "Headers" "6" "jsoncheck.h" "7" "persistenttrie.h" "7" @@ -13896,9 +13889,6 @@ "qmljsutils.cpp" "7" "qmljsvalueowner.cpp" "7" "qmljsviewercontext.cpp" "7" -"Other files" "6" -"parser" "7" -"qmljs.g" "8" "qttest" "5" "qttest.pri" "6" "qtcreator" "6" From ab8cb46ab5d23368bee0e7858b05357c5b67d1a8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 30 Jan 2017 14:44:56 +0100 Subject: [PATCH 2/9] Add changes file for 4.2.2 Change-Id: I36e7564c63c3021f863f343c7c216d9b2df2f1ea Reviewed-by: Leena Miettinen --- dist/changes-4.2.2.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 dist/changes-4.2.2.md diff --git a/dist/changes-4.2.2.md b/dist/changes-4.2.2.md new file mode 100644 index 00000000000..f3ed405838c --- /dev/null +++ b/dist/changes-4.2.2.md @@ -0,0 +1,21 @@ +Qt Creator version 4.2.2 contains bug fixes. + +The most important changes are listed in this document. For a complete +list of changes, see the Git log for the Qt Creator sources that +you can check out from the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline v4.2.1..v4.2.2 + +Qt Support + +* Fixed ABI detection of static Qt builds + +Qbs Projects + +* Fixed duplicate include paths (QTCREATORBUG-17381) + +Version Control Systems + +* Gerrit + * Fixed crash when committing and pushing to Gerrit (QTCREATORBUG-17634) From 4db0b7aa2e4791d7192133f1ffa22e81f0919043 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 30 Jan 2017 16:12:23 +0100 Subject: [PATCH 3/9] Dev package: Add all .pri files E.g. Qt Quick designer provides custom .pri files which are used by designer plugins. Change-Id: I73daa3ef4911120b12f7e320aefe3e67cf507fba Reviewed-by: Eike Ziller --- scripts/createDevPackage.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/createDevPackage.py b/scripts/createDevPackage.py index b0b3837fb31..29afdcb6b4f 100755 --- a/scripts/createDevPackage.py +++ b/scripts/createDevPackage.py @@ -64,14 +64,8 @@ source_include_patterns = [ r"^HACKING$", r"^LICENSE.*$", r"^README.md$", - r"^qtcreator.pri$", - r"^qtcreatordata.pri$", - r"^src/qtcreatorplugin.pri$", - r"^src/qtcreatorlibrary.pri$", - r"^src/qtcreatortool.pri$", - r"^src/rpath.pri$", + r"^.*\.pri$", r"^.*\.h$", - r"^.*_dependencies.pri$", ] build_include_patterns = [ From 3ceb4c5c7a98882dd9a896532525bd3cea694cef Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 30 Jan 2017 22:51:40 +0200 Subject: [PATCH 4/9] Git: Fix result check on reset Choosing Discard on Pull, when there are uncommitted changes, fails when it tries to execute git reset --hard. This broke in ca7a924a068b23815e3915b1f2887eed0e38ef7f: if (!rc) was replaced by if (resp.result == Finished). Change-Id: I19e080ee08eb52bf2156da7c27ade4b77cf2ece0 Reviewed-by: Eike Ziller Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index a7aa1b8064a..3b1afc91954 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1104,7 +1104,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory, // Note that git exits with 1 even if the operation is successful // Assume real failure if the output does not contain "foo.cpp modified" // or "Unstaged changes after reset" (git 1.7.0). - if (resp.result == SynchronousProcessResponse::Finished + if (resp.result != SynchronousProcessResponse::Finished && (!stdOut.contains("modified") && !stdOut.contains("Unstaged changes after reset"))) { if (files.isEmpty()) { msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage); From 54578a550983002290612ba516a777306fdcad9a Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 31 Jan 2017 12:02:09 +0100 Subject: [PATCH 5/9] QtSupport: Add Qt 5.8 specific versions to the feature system Qt.Quick 2.8 QtQuick.Controls 2.1 This enables wizards which require Qt 5.8+ specific Qt versions to show the Qt 5.8+ kits in the kit selection page. Change-Id: If46090bd240106c197c67f9c2b1908d89c608881 Reviewed-by: Eike Ziller Reviewed-by: Michal Klocek --- src/plugins/qtsupport/baseqtversion.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 662ad029754..5ecdb204511 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -471,6 +471,12 @@ QSet BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 7)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 8)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 1)); + + if (qtVersion().matches(5, 8)) + return features; + return features; } From 01c06c4e846155e299644e2e06d7552f29820f9c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 30 Jan 2017 15:19:57 +0100 Subject: [PATCH 6/9] QMake: Disable "Build File" action when opening Qt Creator Change-Id: I99e7c7eb04a02a49881e1b465b1d1098511bc8eb Reviewed-by: Tim Jenssen --- src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index a1d269a1886..1f09ef48b83 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -212,7 +212,7 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString m_buildFileAction = new Utils::ParameterAction(tr("Build File"), tr("Build File \"%1\""), Utils::ParameterAction::AlwaysEnabled, this); - command = ActionManager::registerAction(m_buildFileAction, Constants::BUILDFILE); + command = ActionManager::registerAction(m_buildFileAction, Constants::BUILDFILE, projectContext); command->setAttribute(Command::CA_Hide); command->setAttribute(Command::CA_UpdateText); command->setDescription(m_buildFileAction->text()); From 9979563a5fda3d234c3e28409b34f8ceecf5167f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 31 Jan 2017 10:21:10 +0100 Subject: [PATCH 7/9] Dev package: Add headers and .pri files from qmlpuppet Needed by Qt Quick Designer plugins. Change-Id: Id759e110c31bb4d5f45811be5d910b973022e2cd Reviewed-by: Eike Ziller --- scripts/createDevPackage.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/createDevPackage.py b/scripts/createDevPackage.py index 29afdcb6b4f..64c74e0ba14 100755 --- a/scripts/createDevPackage.py +++ b/scripts/createDevPackage.py @@ -58,6 +58,7 @@ def parse_arguments(): source_include_patterns = [ # directories r"^scripts/.*$", # everything under scripts/ + r"^share/(qtcreator/(qml/(qmlpuppet/(.*/)?)?)?)?$", # for shared headers for qt quick designer plugins r"^src/(.*/)?$", # all directories under src/ r"^plugins/(.*/)?$", # all directories under plugins/ (if this is run on extra plugin repositories) # files From 97760eda7a89cbf90b45d9f349b365a8210f301f Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 30 Jan 2017 18:07:57 +0100 Subject: [PATCH 8/9] Squish: Update BuildDirectoryLineEdit Change-Id: I9d789d501a43ff634ea01a3f5b8afe74c026d0e0 Reviewed-by: Christian Stenger --- tests/system/objects.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 3282b16d2da..354fff8d3b5 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -166,7 +166,7 @@ :Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton {occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_SystemSettings.Details_Utils::DetailsButton {occurrence='4' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_TextEditor::TextEditorWidget {type='TextEditor::TextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator_Utils::BuildDirectoryLineEdit {occurrence='2' type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Utils::BuildDirectoryLineEdit {name='shadowBuildDirEditLineEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit {container=':Qt Creator_Utils::NavigationTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'} :Qt Gui Application.Form file:_QLabel {name='formLabel' text='Form file:' type='QLabel' visible='1' window=':Qt Gui Application_QmakeProjectManager::Internal::GuiAppWizardDialog'} From bea5fe0a634b7a8d49177fd8c5870a975718b2a1 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 30 Jan 2017 16:57:14 +0100 Subject: [PATCH 9/9] Squish: Update moved license file in tst_git_clone Change-Id: I8a34a878e91a64762b28b03d08334148a3dbe8d3 Reviewed-by: Christian Stenger --- tests/system/suite_tools/tst_git_clone/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py index 621b4d68946..20a74e6546d 100644 --- a/tests/system/suite_tools/tst_git_clone/test.py +++ b/tests/system/suite_tools/tst_git_clone/test.py @@ -74,7 +74,7 @@ def verifyVersionControlView(targetDir, canceled): clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) def verifyFiles(targetDir): - for file in [".gitignore", "LGPL_EXCEPTION.txt", "installerfw.pro", + for file in [".gitignore", "LICENSE.GPL3-EXCEPT", "installerfw.pro", os.path.join("tests", "test-installer", "create-test-installer.bat"), os.path.join("src", "sdk", "main.cpp")]: test.verify(os.path.exists(os.path.join(targetDir, cloneDir, file)),