Robert Loehning
1d0e61a52c
Squish: Work around items not expanding
...
Task-number: QTCREATORBUG-14210
Change-Id: I64e5b53c5cb82b961ec100d73f0987d79d68f5b4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com >
2015-04-01 11:12:29 +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
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
Eike Ziller
8295b503be
License update
...
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-10-09 11:41:44 +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
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
480c652836
Squish: Fix expected target
...
Introduced with e08f5044aerobert.loehning@digia.com >
2014-03-31 11:35:05 +02: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
Christian Stenger
2c1bb666c3
Squish: Disable tst_qml_locals if OpenGL is missing
...
VMs used for testing need some adjustment to support QtQuick2 related
stuff. (OpenGL must be usable.)
Change-Id: Icc9b32cd2ad961f328f518276210969d704ad461
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2013-07-11 16:06:00 +02:00
Christian Stenger
97a6ee9685
Squish: Added test for checking locals
...
Change-Id: I8c676982d335c772a5911cab23a52acb2a094ed1
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2013-07-11 09:16:20 +02:00
