feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

1195 Commits

Author SHA1 Message Date
Christian Stenger
66c29ea8ec Squish: Fix tst_CSUP03 
Change-Id: I6556440ebcf77ae3164c4f659ff1c4b6e189d6ea
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-13 13:08:07 +00:00
Robert Loehning
cb42ff0deb Squish: Fix WELP03 
Change-Id: Idf0c03b8a4746f63ab16c7391bc69d65629d7643
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-11 15:33:12 +00:00
Robert Loehning
559d8dc203 Squish: Fix tst_simple_analyze 
Change-Id: I56a7c2a651fc9d2701cf650279a677856b6cf84c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-09 14:36:56 +00:00
Sergio Ahumada
2c876f7443 Update some more links to qt.io 
Change-Id: I043cf78f128dc8d99e3316b951cf91d2f6d6524a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-09 14:30:39 +00:00
Christian Stenger
4a9bf879fc Squish: Fix generic highlighter test 
New MIME type handling differentiates between Haskell and
Literate Haskell.

Change-Id: Iaf1cabb5720b47a893b0755f59b3626d01835ca6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-09 11:48:18 +00:00
Christian Stenger
7142402429 Squish: Fix tst_rename_file 
Changed behavior due to changes related to MIME database.

Change-Id: I54bbfd8ca5d027716ef6bca308df0863635fe474
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-05 12:25:53 +00:00
Robert Loehning
4413096cae Squish: Add Qt 5.4.1 kit 
Change-Id: I8efa72f8695796bd69af11e9904fae143137d1e6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-25 14:17:54 +00:00
Robert Loehning
243a0e54be Squish: Fix bitwise operators for selecting kits 
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-19 13:35:45 +00:00
Robert Loehning
baf62f94fb Squish: Remove outdated note about Qt4 from README 
Change-Id: I0638a56d6bd833a6a7a97f7ebda7a99ab20e255d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-18 12:59:16 +00:00
Robert Loehning
0c0b0c2f45 Squish: Update DiffEditorWidget in objects.map 
Change-Id: I7c3a1f85a379afcc48189b38da20fa63adaa7531
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-17 12:22:28 +00:00
Eike Ziller
45e544b442 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I79fac4a4e8535153da1b3f73a6b1caad1513ea9c
 2015-02-16 12:35:54 +01:00
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Robert Loehning
033a628cdc Squish: Updates for renamed template 
Change-Id: Ic5a3fad69d8fb2875b7578cb58c8f3203678531a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-13 12:37:10 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
 2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Robert Loehning
28971701fd Squish: Don't rely on progress bars when parsing qbs project 
Task-number: QBS-746
Change-Id: I316934884432953e2137d7e97b73fce352be4cac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 12:25:46 +00:00
Robert Loehning
e11caa793a Squish: Remove outdated code 
Change-Id: I765374645bb6176028416e7ad8e4ce69df65723d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:45:44 +00:00
Robert Loehning
f2c9cd655e Squish: Prepare help tests for Qt 5.4 
Change-Id: I38568b325ae37d8b75ad3481ef0cc6ced0a99488
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 11:13:38 +00:00
Robert Loehning
26972ade65 Squish: Stabilize tst_qml_editor 
Avoid false fails with Squish 5.1.3 and Qt 5.4.0 on Windows

Change-Id: I4d330627ed7d93ad7e327aebd9c9d3173e34a8e1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-02 14:22:54 +00:00
Robert Loehning
98f2a74f90 Squish: Update tst_git_local 
Change-Id: I4bc64ad82bddf448b6846fe3a75941741c32a24a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-30 10:05:06 +00:00
Robert Loehning
37bbc8a4d4 Squish: Expect correct path when adding file 
Change-Id: I46bf8399ec72a56212b631a6094b180e5da0981f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-29 09:50:26 +00:00
Robert Loehning
f78479014f Squish: Disable pastebin.ca for now. 
"Server is at capacity"

Change-Id: I440dca1e2d6bfab13b2fe59662691df4fa724ba7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-21 10:56:44 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Robert Loehning
6ad3f3975c Squish: Update menu objects 
Change-Id: Id1c8ee441a8479aa2bd19410e88c4ea48d0ee3f9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 15:17:54 +01:00
Robert Loehning
9d9ec3a91b Squish: Load QmlProjectManager if needed for debugger tests 
Change-Id: Iffea74ffa8794b8c496987a4eb22ff76f181f55e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 13:06:40 +01:00
Robert Loehning
3476546717 Squish: Expect wrong path when adding file 
Task-number: QTCREATORBUG-13831
Change-Id: Ide335c00491a50ca8087fa07e27c0191e0d646b6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 10:11:48 +01:00
Eike Ziller
df3176d5e3 Merge remote-tracking branch 'origin/3.3' 2015-01-14 16:06:46 +01:00
Christian Stenger
4f1e9aa485 Squish: Re-enable testing of Pastebin.Ca code pasting 
Change-Id: I67f8d9705cd7b5063322e53fb3d745d0314b9fc0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-01-14 13:38:48 +01:00
Robert Loehning
6e2782b8b0 Squish: Test first commit in git repo 
Task-number: QTCREATORBUG-12755
Change-Id: Idf27f4bc19ec62ce10ca9367e0b32b8d2b031587
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-09 12:16:21 +01:00
Eike Ziller
b5b47f7df2 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
 2015-01-08 10:38:20 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL 
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2014-12-19 10:18:23 +01:00
Christian Stenger
f515a2528e Squish: Enable QmlProjectManager plugin for tst_qtquick_creation3 
Change-Id: Idaa2a603f5945a4df249f9b6ce606769a5c7ea74
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-16 07:19:39 +01:00
Robert Loehning
1be459d9dc Squish: Avoid error in tst_build_speedcrunch 
Change-Id: I2f199f392016005b8e00e48253838370628875d9
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-15 16:25:04 +01:00
Christian Stenger
949a86f035 Squish: Fix tst_git_local 
Change-Id: I6acdaaf81a0b8c2523df4fda4ee7ec044da25678
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-15 15:24:30 +01:00
Eike Ziller
541d00453a Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
 2014-12-10 13:20:02 +01:00
Robert Loehning
5ff6bbd4cd Squish: Test auto variables in tst_memberoperator 
Change-Id: I7b5bbdcfbd685abb5a716cc237276761065eb962
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-05 11:17:40 +01:00
Christian Stenger
64d6d64c93 Squish: Let test continue instead of crashing on protocol error 
Change-Id: I3c862d26fbbdf124c0b347225cfd97e0748a0830
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-03 12:09:29 +01:00
Eike Ziller
a47fbb8309 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
 2014-11-24 15:43:48 +01:00
Robert Loehning
cddd19239d Squish: Waiting for "Cancel" button to come and go 
Same concept as in progressBarWait()

Change-Id: Ic8e21663f7b0831c79e440dc4aa76237dc814e5d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-18 11:10:29 +01:00
Robert Loehning
8871f0b36b Squish: Wait even longer for indexing docs 
Change-Id: I69a09389d4ecc8fefea96311ea8144dbc4f838e2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-17 13:26:42 +01:00
Robert Loehning
3c3ded74fe Squish: Wait longer for indexing docs 
Seems to timeout frequently on Windows test machine.

Change-Id: I07827555d1c5044a37e708051704644995fe4b17
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-13 12:51:25 +01:00
Robert Loehning
fdb91f5135 Squish: Wait for search results consistently 
Change-Id: I956bf543505c5391a78325070b72e3affc5133a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-13 12:50:02 +01:00
Christian Stenger
b5478c994c Squish: Fix tst_git_local 
UI for committing files has changed.

Change-Id: I452e1e7f1bd4a976d8fb0a3a98927ddbfb372213
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-11-10 13:24:44 +01:00
Christian Stenger
48a90eea3c Squish: Remove Squish 4 from mapping file 
Change-Id: I3b81e5389462a688c6da5c2a1a0ed7a38ecc833a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-11-06 07:51:27 +01:00
Christian Stenger
023eb375ca Squish: Fix creating empty qmake project 
Change-Id: I6607afde615d40a94597678665e8f30a2d6d87c6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-11-04 13:25:55 +01:00
Eike Ziller
cd5e00034d Help: Fix highlighting of search terms. 
It was using the wrong search help engine to get the search terms.
Instead let the search widget itself figure out the search terms, and
pass it directly on to the help widget when activating links.

Change-Id: Ib72220eafca69e92894fe7584b1e4dfd9a42cc7e
Task-number: QTCREATORBUG-13239
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-04 07:57:08 +01:00
Robert Loehning
335ada73c4 Squish: Expect missing manual 
Change-Id: I296d492ea79512ac73dfec4d86743b1203ee9631
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-31 14:52:12 +01:00
Robert Loehning
07a52d1ae6 Squish: Remove Qt4 compatibility code 
Thank you Qt4 for all the good times we had together.
Farewell.

Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-31 14:52:03 +01:00
Robert Loehning
065594174a Squish: Expect no highlighting in help 
Task-number: QTCREATORBUG-13239
Change-Id: Id2e7340b0ed8baa8dff1e1dbbfb45a1219c12a63
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-30 15:00:22 +01:00
Robert Loehning
5a58c4080a Squish: Test renaming of includes 
Change-Id: I0c3d64ae6339ff41fc742b67618efbf69998c64e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 13:57:30 +01:00