Commit Graph

40031 Commits

Author SHA1 Message Date
Thomas Hartmann
83e128ec79 QmlDesigner.Instances: use TypeName instead of QString
A dynamicTypeName has to be always latin1 so we should use TypeName
instead of QString.

Change-Id: I06c945aa61f677788285cbc8ff8f5811f6c61b0b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-16 09:43:41 +00:00
Alex Trotsenko
b3d9c5e5e9 Fix TextEditor plugin compilation
Declare classes before use them in QObject::connect().

Change-Id: Id9e8b6f753b303948e0d9d1dc9a29d9592bd6807
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 19:12:51 +00:00
hjk
17bbb4eb8c Debugger: Fix PdbEngine 'stepOut'
It's 'return', not 'finish'

Change-Id: I75bd7dc5f7caff2b63caa54badd958cb27e4e7e3
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 18:14:22 +00:00
hjk
5ee6382728 Debugger: More PdbEngine cleanup
Change-Id: I7b17ffba4f2cc48c7a640e6ccc465e38197777dd
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 17:49:12 +00:00
hjk
6e8b5c07ae Compile fix after file name change
Change-Id: If3434ca14030d9914f9be6119d8505a7096b3582
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 17:42:51 +00:00
hjk
aa67078276 Debugger: Implement basic value assignment for PdbEngine
Change-Id: I505c3e9c4a239ed381d525b5acaf1acf3a06a59a
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 17:05:29 +00:00
Sune Vuorela
d70bdaf450 Make Qt Creator build with -Werror=date-time
As a part of making the Qt Creator build reproducible, ensure that the
build time isn't by default encoded into the binaries.

Change-Id: I92bc3c2e832d5397bc1e2599214ef3ba911fed0b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 16:58:39 +00: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
hjk
055c4ecb53 Debugger: PdbEngine cleanup
Change-Id: I39f072fe819da746c624e6028b0e5e17f1f1f111
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 16:12:16 +00:00
Christian Kandeler
324854a5cf Do not add an "Analyzer" category to the "Issues" pane filter.
The analyzers don't add tasks to that window; they have their own
specialized ones.

Change-Id: I182b7f44c5297f5e7e33cfc82475fe74fbe1ebc5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 15:48:00 +00:00
Daniel Teske
e7b90b8681 Android: Set correct ANDROID_NDK_PLATFORM
Introduce the class AndroidQmakeBuildConfiguration whose purpose is
to set the environment variable. Modify the Factory to create
buildconfigurations of that type and fix restore/clone to also
take the factories' priorities into account.

Change-Id: Icb377fa9211cd3564c36b60cf7c5f7dd84fcab50
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-02-13 15:35:35 +00:00
hjk
5442d144b6 Debugger: Hide PdbEngine infrastructure from itself
Debuggers running inside the debugged application are weird.

Change-Id: I2452e3653221c8f585123852ea113bd2fdfd08ed
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 15:01:39 +00:00
hjk
ee4cbafb0b Debugger: Compile fix for VS 2012
Change-Id: I79c17d36304c7afc8e500a713cd859f91d832700
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-02-13 15:01:21 +00:00
hjk
d0b448aa29 Debugger: Simple tooltips for the PdbEngine
Change-Id: I320860ddf06a82bd35fb172eda6a5f6f812ae415
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 14:52:38 +00:00
hjk
d479701591 Debugger: Start moving PdbEngine to event based parsing
Change-Id: I63e06045b54226636280678ae7db8326a3e5f02e
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 14:51:39 +00:00
Eike Ziller
e5bbd86ab9 Fix up for 88e7f935f4
Project::generatedUiHeader was still taking QString instead of FileName

Change-Id: I582ddccd679a35fb2533ff1eb3d3010342cd4edd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-13 14:05:21 +00:00
Orgad Shaneh
88e7f935f4 ProjectExplorer: Use FileName for Node::path
Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 13:14: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
hjk
60962303d1 Debugger: Use base DebuggerCommand also in PdbEngine
Change-Id: I92c2668353c05c00b1593439b55745d9b209a997
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-13 12:28:23 +00:00
hjk
fae20871fa Debugger: Use base DebuggerResponse also in PdbEngine
Change-Id: I1bcc62f191dfc7a201da7b5723c15587c7ba4e7f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-13 11:52:26 +00:00
Sergey Belyashov
62bffaca98 Fix theme loading problem
Error caused by any file named as current theme and placed to directory
which is used for starting Qt Creator (formely user home directory).
For example, create empty file with name 'default', place it to your
home directory (for example: /home/user) and run Qt Creator. As result
you will see black corrupted screen.

To fix this bug I add checks of theme name. Now Qt Creator will only
load theme from current directory if name is explicitly provided by
the user or it is an absolute path.

Change-Id: I0255c8d220d84bd5b51de7ef9d64c66f7f57959c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 11:28:47 +00:00
Orgad Shaneh
ed7c287f50 Theming: Add a Color value for splitter
Used BackgroundColorSelected as a workaround in 3.3 in order to
maintain BC.

Change-Id: I1520deb8adcfed26b65aa7f4612218d15c310923
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-02-13 10:25:24 +00:00
Orgad Shaneh
e717a75e38 Theming: Sort Color enum values
Change-Id: I2c234e2217ab1aa5e150e6fb721818b6ed9d22a9
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 10:25:19 +00:00
hjk
a081fee8f5 Debugger: Cleanup lldbbridge.py
Move reusable Breakpoint enum to base, use 'theDumper' uniformly
across backends as name for the Dumper singleton. Signal
engine setup only if the Dumper successfully initializes.

Change-Id: If1b6be9d054f249d0d46061e4949cbecf4fd09cb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-13 09:55:35 +00:00
hjk
a7fce39103 Debugger: Start moving PdbEngine to common Gdb/Lldb base architecture
That's still not meant for "production", but just the "3rd use case
needed to get abstractions right".

For testing, remove all build steps, and use a custom run step
with executable /usr/bin/python and argument pointing to the
main .py file.

Change-Id: I6ae6ed08597896ea979ee58e73c546c7892e8be2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-13 08:54:14 +00:00
Eike Ziller
2de389548c Fix compilation issue with merge
Change-Id: I5c1e2b6f0a7bb86e8076ec60342bf47d123eb123
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-12 17:12:18 +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
hjk
f1c5889e77 Debugger: Some code modernization
Qt 5 signal/slot, a few auto.

Change-Id: Ia17f1b3dcd41dfe0a373c14e7c1d34d210d084f1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 15:14:55 +00:00
Eike Ziller
0eabe62786 Merge commit 'd83fb4d63c9fd92e0e6f429cbd56fa244bddc093'
Change-Id: Ibd6f8cd83c60f0c65387b62b7692aa8a4c025acb
2015-02-12 15:30:33 +01:00
Nikita Baryshnikov
052de4d178 ManageDefinitionsDialog: Fix regression
after 102e49ca37

Change-Id: I5f2fb7c3309d0c14e4c470bb2716ee000d8ddc95
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-12 13:32:42 +00:00
hjk
f91cc66f9a Debugger: Combine some watch related GDB and LLDB code paths
Change-Id: I20e5f6f04418c931354a07bc3597f6982fcaf942
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 12:49:21 +00: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
Christian Kandeler
cf21092ec5 Analyzer: Use QKeySequence::copy for copying to clipboard.
Change-Id: I238eace2198e5a2329ce7db559e4df354e84cb80
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-12 12:08:16 +00:00
Christian Kandeler
62e30ad562 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I1b900208dd52978ae0a7cf0a79e2469cfc6928f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-12 11:11:54 +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
Nikolai Kosjar
921ec6da5a C++: Cache parsing of template ids
...in order to stop memory intensive parsing for invalid code.

Parsing the test data/snippet "hard" led to a memory consumption of
about 5.5MB and this could easily get up to hundreds/gigabytes by adding
some more "if_<bool_<true>,\n" lines. With the caching, we are at about
1.0MB, even if more lines are added.

The "memory consumption" was measured with valgrind-massif. The stated
numbers are the reported peaks.

Task-number: QTCREATORBUG-12890
Change-Id: Ie7eb00cfc7915552d29bb27410a6b13a486f486e
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-02-12 10:40:14 +00:00
Nikolai Kosjar
ae3aa07c4d C++: Remove workaround for crashing if parsing invalid code
This reverts the changes

    commit beac7b9539
    C++: Fix highlighting after "invalid code"

    commit 78ab287fc6
    C++: Stop parsing a declaration after two tries

which were a work around for QTCREATORBUG-12890.

A follow-up patch provides a proper fix.

Task-number: QTCREATORBUG-12890
Change-Id: I2650a8e41c8ff1180cad9f069e463fc51bd2f1b1
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-02-12 10:39:51 +00:00
Nikolai Kosjar
d68fc038cc QmakeProject: Fix mkspecs dir include path
1) When the compiler is invoked, the mkspecs dir is the very first
   include path, but the code model got it as the very last (still before
   the system include paths) include path.

2) We had it twice in the include path list.

Change-Id: Ia46b6009359c5799790e6c856113ea133b8212c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-02-12 10:39:38 +00:00
Nikolai Kosjar
e9b94c131c QmakeProjectManager: Shell-interpret project defines
...since they are meant to end up in Makefiles.

A define like

    DEFINES += SRCDIR=\\\"$$PWD\\\"

was passed on to the code model as

    #define SRCDIR \"/tmp/dir\"

instead of

    #define SRCDIR "/tmp/dir"

Change-Id: I7af5c8d82b3b937ca9db70f6580bab3419fb4550
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-02-12 10:38:06 +00:00
hjk
9df463da84 Debugger: Convert bb extension to use runCommand
Change-Id: I528c51d2b02dccd91429778ef8c940fe5565345f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 10:27:33 +00:00
Christian Kandeler
d9408156d1 Analyzer: Put more common code into the DetailedError* base classes.
Namely:
    - The "copy" action and the corresponding "slot".
    - The context menu.
Plus an infrastructure for adding new common and custom actions.

Change-Id: I4bf8b28b4ad60b4022abbfc0b401c3b832b94560
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-12 10:23:45 +00:00
hjk
875d889082 Debugger: Move bbsetup over to runCommand()
Change-Id: I0a19b28d24cb570651ea84bf7cdbc9a761f85a0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 07:19:48 +00:00
hjk
f65cb6ae4d Debugger: Complete switch to Python for GDB stack generation
The iteration in Python was only used for the 'native mixed'
case before. Seems reasonably fast and robust now to always
enable it. Also, make the calling code use 'runCommand'.

Change-Id: I10565a725dfaa9bf46c28739c69e9f2546498929
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-11 16:34:51 +00:00
hjk
e76c4839bb Debugger: Consolidate some GDB-through-Python interaction
Instead of calling a GDB extension command invoking a function
on the well-known Dumper instance, call the Dumper function
directly. This also makes the code more similar to the LLDB side.

Change-Id: I4b23177eb72a904721b63c578ce7fbfe204f02a2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-11 15:00:35 +00:00
Orgad Shaneh
2c4b9fb64f BinEditor: Include null chars on ASCII copy
Replace them with spaces

Change-Id: I2d3cad8c7c34c222d971e3cdf56a85824342e9be
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-11 14:05:42 +00:00
Nikita Baryshnikov
5930e62b84 Utils.Transform: fix stolen const on MFP
Change-Id: I44ef3bac606a733a81f95472d0ca5bb50ee3bca0
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-11 11:39: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
Eskil Abrahamsen Blomfeldt
8d27ec664a Android: Fix debugging applications that link many modules
When debugging an application we will add a few arguments
to the command line for launching the application. We would do
the same for every library etc. required by the modules linked
to the application. At some point, the command line would become
too long and fail to execute.

Passing the libraries, libs_prefix, etc. on the command line
is not necessary, since the parameters are already included in
the AndroidManifest.xml, otherwise it would not be possible to
launch the application from the device itself.

Change-Id: I93a7f64a4ce32ebb2b25c54b0d17ae2b23706e24
Task-number: QTCREATORBUG-13691
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-11 11:05:53 +00:00
hjk
85a502ab38 Debugger: Add tooltip to tooltip copy button
Hard to guess otherwise what it is meant for.

Change-Id: I92221da8d0dbe92b579d0cf97a76224a57447ec0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-11 09:03:20 +00:00