Joerg Bornemann
cabbeb1c54
Synchronize autotest defines in qmake and qbs build
...
Do not remove QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION
in QtcAutotest, but in the two tests that won't build with it.
In the qmake build the defines are not removed from json.pro, because
this file does not include qttest.pri.
Change-Id: I97d173528ca2a02bac1bfae30709a959e6b69375
Reviewed-by: Christian Stenger <christian.stenger@qt.io >
2018-03-19 11:50:38 +00:00
hjk
e3f0e1be08
Qnx: Use simpler portsgatherer command
...
As indicated by the removed comment, the original version was
way too complicated.
Change-Id: Ie5d8d8fbe7bd8e44e0538117cd2aaa73958f7d8c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io >
2017-09-29 10:10:08 +00:00
hjk
e404ba9de1
PortGatherer: Add test for Mac's netstat output.
...
Change-Id: I6df357502e5621e858a848c567fe1590762d5fc1
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com >
Reviewed-by: Eike Ziller <eike.ziller@qt.io >
2017-08-30 12:56:11 +00:00
hjk
45caf84cc9
ProjectExplorer: Fix parsing ports from netstat output on Windows
...
Handle IPv6, and do not try to interpret the result as hex.
Change-Id: I700c233d03cc706bc8712ab9fabee75d7f126df3
Reviewed-by: Christian Stenger <christian.stenger@qt.io >
2017-08-24 09:53:00 +00:00
Orgad Shaneh
c841dc551c
Introduce and use Utils::stripAccelerator
...
Change-Id: I8c37728ca5de20e2b68e6d0ac7fc120baa696040
Reviewed-by: Eike Ziller <eike.ziller@qt.io >
2017-07-07 12:17:40 +00:00
Christian Stenger
bd259129b5
Tests: Fix compile
...
Broke with 4e96f2cetobias.hunger@qt.io >
2017-06-21 13:34:36 +00:00
Tim Jenssen
2631ffabd5
Remove spaces in initializer lists
...
Format initializer lists code style like.
Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io >
2017-02-22 16:25:09 +00:00
Orgad Shaneh
3be096f152
Utils: Support default value substitution in macro expansion
...
Syntax is similar to bash substitution:
%{variable:-default}
Change-Id: I50e4e18a186c5408dc8b7b95cebbf891d13e03bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: hjk <hjk@qt.io >
2016-07-18 13:15:58 +00:00
Orgad Shaneh
2ec82a2a93
Utils: Support pattern substitution in macro expansion
...
Syntax is similar to bash substitution:
%{variable/pattern/replacement} takes the expansion of variable, and
replaces the regular expression pattern with replacement once.
%{variable//pattern/replacement} replaces all occurrences.
Capture groups are supported for both forms.
Change-Id: I67ff91e2dad4dd8be81573ea446cd1093a05ccf6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: hjk <hjk@qt.io >
2016-07-15 13:26:41 +00:00
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
Christian Kandeler
ed30c612f4
qbs build: Remove workarounds for fixed qbs bug.
...
That was most likely QBS-755.
Change-Id: I43d0316113fcca79554bfee9eee9b8bd706fce07
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com >
2015-08-28 08:13:11 +00:00
Orgad Shaneh
cde50f23fc
Tests: Fix compilation
...
Change-Id: I7cb3b5636413abfc52578e8ae0c43f745efa2f0d
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2015-03-14 17:26:12 +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
hjk
4f6279256d
Tests: Move auto/utils_stringutils to auto/utils/stringutils
...
Change-Id: I475a5914f3b65656dc12cf7619bfed34e9fc8b74
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com >
2015-01-16 13:32:41 +01:00
