feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
40,153 Commits 108 Branches 368 Tags
4a1b6c1fd836c51a24f18fcbcccef4254fedbae4
Commit Graph

114 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Christian Stenger
42236fc734 Squish: Fix some tests due to latest refactorings in QC 
Refactoring of dialog wizards and editors.

Change-Id: I6604a302b04579519c78698375bc4b1027ac8b02
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-13 14:15:12 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
 2014-09-29 13:40:53 +02:00
Robert Loehning
bacf4f0afb Squish: Do not crash tst_simple_debug if debugger can't stop 
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-26 15:42:30 +02:00
Robert Loehning
f2b5f6a8eb Squish: Updates to keep suite_debugger running 
Change-Id: I3096289a935b654005cdc7440a87cbc527410c64
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-17 16:45:04 +02:00
Ulf Hermann
8b3b868f4c QmlProfiler: Rename JavaScript view to "V8" 
The fact that the separate JavaScript view only works with versions of
Qt that use the V8 JavaScript engine is frequently confusing users.
JavaScript events for newer versions of Qt are integrated into the
Events and Timeline views, making the separate JavaScript view obsolete.
For those users who already know it and who are still using Qt 5.0 and
5.1 "V8" will be recognizable. For others "V8" won't mean anything and
they'll ignore it.

Change-Id: Iac0d89db24a3677e47b978a152cfc25c01f9c2b6
Task-number: QTCREATORBUG-12766
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-18 10:33:13 +02:00
Robert Loehning
ed9261733b Squish: Replace Qt 5.0 by Qt 5.3 
Change-Id: I2fb5ea259c523fce4e71f02ca087ed93fd9a0ae1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-29 18:15:05 +02:00
Christian Stenger
469fe52af7 Squish: Provide test for QmlJSConsole 
Change-Id: Ib7cbf312b611176dbb762958bca687e043372a27
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-22 13:11:42 +02:00
Christian Stenger
eff566b3b2 Squish: Make sure the project has been opened 
Change-Id: I14119e1bc9498cc0fd722f5842f4275b644911fb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-10 15:55:27 +02:00
Christian Stenger
881632c390 Squish: Fix expected values in tst_simple_analyze 
"Source code not available" is shown again - now they're displayed
from the view instead of being added explicitly to the model.
See ccf871aa20.

Change-Id: I8c370008005c9453cc86dacb410b310b972e03eb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-03 10:02:54 +02:00
Robert Loehning
b415cc3cac Squish: Update expected values of tst_simple_analyze 
Change-Id: I8b11ebe20cfa432a37858c582a1a36b9bd718ce2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-27 12:17:17 +02:00
Robert Loehning
e2de42a705 Squish: Replacing some usages of len() 
Change-Id: Icaf029043fed149bff6e15861fdcc6d640a2ecfc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-23 14:58:37 +02:00
Robert Loehning
556ec551d7 Squish: Selecting right config in verifyBuildConfig 
...by just calling selectBuildConfig.

Change-Id: I8f07b3d874c22ebeca8e5cf658d754cf231c7ad0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-15 12:17:31 +02:00
Robert Loehning
8eefc34419 Squish: Update paths to QML files 
Reaction to 96367b6253

Change-Id: I9651f9cac2b6c48158fa9094ef86ef04460e8a16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-08 16:44:23 +02:00
Robert Loehning
92239b6753 Squish: Verify elapsed time from QML Profiler 
Task-number: QTCREATORBUG-11952
Change-Id: I1ef4b5ec7dfcf56cb7c07882b8e091fd84b26121
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-04 15:05:46 +02:00
Christian Stenger
480c652836 Squish: Fix expected target 
Introduced with e08f5044ae.

Change-Id: I81332377cd2bcd94c06c6b94b1750228172aa1f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-31 11:35:05 +02:00
Christian Stenger
79497e7fae Squish: Fix Qt Quick 1 related tests 
qrc files are now used in Qt Quick 1 template as well.

Change-Id: I7b7541d16100285893587605bb1b4130277b72e4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-21 12:56:18 +01:00
Christian Stenger
9637e65698 Squish: Fix tst_simple_analyze 
Used template has changed - correcting the expected values.

Change-Id: I8d60f3c75f1f88d80c31f68276ac083e2215e8f7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-11 14:20:17 +01:00
Robert Loehning
90dc3fec6d Squish: Fix tst_simple_debug after change of file template 
Change-Id: I44a8450ae089c14aac8911d6e3c5802b497d9044
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-06 15:38:14 +01:00
Christian Stenger
0f1105d8c1 Squish: Add workaround for mixed debugging bug on Mac 
Change-Id: I4634a10d06ff30998787a215886b642d8349bb8f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 13:13:34 +01:00
Christian Stenger
e7297926ef Squish: Update objects after merging BaseValidatingEdit... 
...into FancyLineEdit.

Change-Id: I7e45861783a7bdf160827595b4e455d869884c81
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:18 +01:00
Christian Stenger
48770e5785 Squish: Remove gdb debugging helper stuff 
Change-Id: Ib437d65da31546c8705b64d5ab320f7a7e226bc7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:50:12 +01:00
Christian Stenger
f3f1edfa06 Squish: Fix Qt Quick / QML related tests 
Adjust expected files to slightly changed layout.

Change-Id: I4b5ab838558b2e1b3a0c13fafcc37efebb014c19
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-12 17:23:56 +01:00
Christian Stenger
3f44590f4b Squish: Remove special handling for gdb issues on Mac 
Change-Id: Ib3473b9f5e984441b7d1dcfe4f5c007e5b435f5a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-12 09:04:21 +01:00
Christian Stenger
d602a942a9 Squish: Fix tst_simple_analyze on Windows 
Change-Id: I7088e237de1f1c602aa79abe19d0a656693cfa20
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-11 12:46:41 +01:00
Christian Stenger
8087db30a3 Squish: Do not invoke Exit on AUT inside helper functions 
Quitting the AUT should always be reserved for the main function
of a test case.

Change-Id: I1a90e7c1e327cde37280e9d3130b30216798382c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-28 12:22:38 +01:00
Christian Stenger
dc8481ca25 Squish: Stabilize tst_simple_debug on Mac 
Change-Id: Ibcf179a1d10c0e735fe408a7f738309834d8abc4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-22 16:08:58 +01:00
Robert Loehning
52bff97cfa Squish: Replaced lot of signal code by one simple function 
Change-Id: Idb6b663a8b2be217d8769fab5e2f6f9290f37990
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-22 10:13:02 +01:00
Christian Stenger
fca97a53d4 Squish: Clear analyzer results after verification 
Change-Id: Ic475704773770d7d17361c96947734681e959fea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-21 23:09:41 +01:00
Christian Stenger
d8cc72d7bd Squish: Let tst_debug_empty_main continue on error 
Change-Id: Ic0772f96c3d99af1d2001ca599820bc61192281c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-20 13:38:58 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Robert Loehning
1734e368b6 Squish: Improve waiting in tst_simple_analyze 
Change-Id: I430e9190beab25f51b187c007c0d7624810c2509
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-19 13:44:26 +01:00
Robert Loehning
5bcc7240f1 Squish: Replace failing wait statements in tst_cli_output_console 
Change-Id: I862812802722f66b6c100458b5aaea7c7165b248
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-19 13:08:34 +01:00
Christian Stenger
cae7802902 Squish: Add missing envvars files 
Change-Id: Ifecd94b1b9ef8d3833474a45a258f219ceb9f86b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:05:13 +01:00
Christian Stenger
d94d343f4d Squish: Perform additional Profiler test 
Change-Id: I9ca615f89ac772fc87b9dc91ed2fbc42a3b763a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:04:28 +01:00
Christian Stenger
ff2d6aa8f7 Squish: Fix tst_simple_analyze 
The JavaScript tab is now disabled if there's no content at all.

Change-Id: I00e0a6adabd42d0783ad6833fe707323f5a69aae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-26 16:10:19 +01:00
Robert Loehning
98c9847868 Squish: No QML debugging with Qt 4.7 
Task-number: QTCREATORBUG-10528
Change-Id: I41eab9bc179cb00b489dbc7576dd36c6377569a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-11-22 17:20:49 +01:00
Robert Loehning
1d052d308e Squish: Stabilize setting "Run in Terminal" 
Change-Id: Icddb2852975ad72c9c6e70d71c07a89a390576fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-25 13:47:30 +02:00
Robert Loehning
95828d4691 Squish: Handle differences between Qt 4 and Qt 5 
Change-Id: I529d5cbd017f7d17fbe2f38fc539583e96d835cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-27 12:28:23 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00