Tobias Hunger
954569387c
Update License according to agreement with Free Qt Foundation
...
* Update license information in tests directory
Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com >
2016-01-19 16:01:06 +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
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
8295b503be
License update
...
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-10-09 11:41:44 +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
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
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
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
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
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
Christian Stenger
8b7dff6fdc
Squish: Fix tst_debug_empty_main for Mac
...
Change-Id: I57cd9647d07cfbf823bdff63dd1c2f5c3050cb7c
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2013-09-20 12:48:03 +02:00
Christian Stenger
81d9d9126f
Squish: Test for debugging empty main for Qt/C/C++
...
Change-Id: I774a610b1dab5b4db4f62ff267084aad9095d3a7
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2013-09-02 10:06:08 +02:00
