Commit Graph

28855 Commits

Author SHA1 Message Date
Tobias Hunger
a189ec5537 Fix warning
Change-Id: Ida1e147c2fbd646412c9d3817a3847755307adc9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-10 11:35:31 +02:00
Sergey Shambir
0609333e02 CppTools: moved some logic to ProjectFile
Simplifies code and makes it independent from mimetype names.

Change-Id: Ib56a07654df4986b1916c517e3862e6c3a3dd720
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 11:07:27 +02:00
Friedemann Kleint
d61bc4fcec Clean headers in CppEditor.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I61a5c2fff02616f6883ddf3923e4361fca6bf92b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 11:04:22 +02:00
Friedemann Kleint
0a5eeb542b Fix widgets flashing before start.
Pass parent to status bar widgets.

Change-Id: I5834ce5feececc33e850dafd55f3b29bd0df38c8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-10 11:01:11 +02:00
Friedemann Kleint
4b0bafd615 Clean headers in CppTools.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 10:55:14 +02:00
Tobias Hunger
7d163a079d DebuggerRunConfigurationAspect: Update based on project languages
Update when the list of languages in a project changes.

Change-Id: I2ed1089b8c7a6358b1c398d388b8ad2143ec432e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-10 10:34:47 +02:00
Tobias Hunger
4cc9592c02 ProjectExplorer: Update context whenever project language/context changes
Change-Id: I3bd68518f8aab50e10353b7664e81f6d6783c6cc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-10 10:29:54 +02:00
Timo Jyrinki
6f2a0c66a3 Use the qtchooser default Qt on first run instead of forcing Qt 4.
Task-number: QTCREATORBUG-9068

This makes 'qmake' the first qmake binary to check when iterating
over possible Qt:s on the system. Without this if the system uses the
old way of adding version suffixes to Qt binaries (kept for Qt 4 for
compatibility reasons in Debian and Ubuntu), Qt 4 would be used
over Qt 5 even if Qt 5 is the default.

I've tested it to be working on Ubuntu 13.04 and 12.04 LTS as follows,
with Qt Creator 2.7 patched. At each phase I removed the old Qt Creator
configuration to simulate first run.

1. With Qt 5 as the default, no qmake-qt4, Qt 5 continues to be found.
2. With Qt 5 as the default + qmake-qt4, Qt Creator now still finds Qt 5
as it's the /usr/bin/qmake - this is the part that fixes the bug.
3. With Qt 4 as the default, Qt 4 is found via /usr/bin/qmake
(before, it would have been found via qmake-qt4 symlink).
4. With qtchooser removed but qt4-qmake still installed, Qt 4 is
found via /usr/bin/qmake-qt4 as a fallback.

Change-Id: I05ed6dc0e81336330a0b3b458249e9c7c928cc40
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-10 06:07:52 +02:00
Petar Perisin
08eb65fb04 Git - Bug fix in changeSelectionDialog
disable checkout button too

Change-Id: I325436672091c6f4f824ed263c2643ecf31f93f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-09 20:02:18 +02:00
Daniel Teske
befd041dbd Android: Add/Remove Android Device on configuring android sdk path
Task-number: QTCREATORBUG-9017

Change-Id: I5adf4be57b76cf8d0f8e0afebe9540a9f92a29a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-04-09 19:08:23 +02:00
Eike Ziller
5a3dfb767f Move progress indicators out of mode bar.
This both allows the mode bar to be hidden optionally, and can give the
progress information a bit more room (e.g. for titles).

Progress information can either be shown in "pop up" windows in the
lower left corner of the main window (hiding window contents below),
or in a summary progress bar in the bottom right corner of the status bar.
Hovering the summary progress bar temporarily pops up the detailed
progress information. Keyboard can be used to switch between the two
views.

Change-Id: Ic6d6ab4fd43906e84b480c8ddf8eae5f5852e1f3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 15:50:25 +02:00
David Schulz
c5f7cc62bb cdbext: Dump QHostAddress initialized with uint.
Change-Id: I1fa9587370d1ab90235cda63192a5908fa53fd4b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-09 14:57:19 +02:00
David Schulz
fb6969ae5b cdbext: Remove dumping of QImage pointer address.
Change-Id: I61170c9be1cc3cd49e518dd124d020273a87b610
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-09 14:34:21 +02:00
Eike Ziller
dd731a8998 Add right aligned location for widget in status bar.
Change-Id: I7ff41fc891836d15b2b9b6bf090feaf2e4feb968
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 13:05:48 +02:00
Lorenz Haas
90ba1c2f23 Fix typos in documentation
Change-Id: Ie8b09b8339f219064b4f1d969246a6f84342a4fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-09 12:04:03 +02:00
Erik Verbruggen
82e347095c C++: Untangle include file resolving from loading.
Change-Id: Iacf8cb12dd623c908538d80ee2595297a9bdde71
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-09 11:56:02 +02:00
Erik Verbruggen
857457e057 C++: handle non-arguments in function parameter scope gracefuly
Task-number: QTCREATORBUG-8316
Change-Id: I8897f75f30d3aeaf049cc792060c582ab1e3343d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-09 11:49:00 +02:00
Friedemann Kleint
9d7e786b03 Provide instance()-method for Utils::NetworkAccessManager.
Preemptively fix exit warning "QEventLoop cannot be used
without QApplication" (Qt 5/dev) emitted by destruction of
the of the generic highlighter manager singleton which had a
member of type Utils::NetworkAccessManager.

Use a single instance of Utils::NetworkAccessManager for the
main thread and clean up properly using a qAddPostRoutine().

Change-Id: Ida57b9028a79eb4927818ce49088ea567f3bdfd6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-09 11:39:56 +02:00
Sergey Shambir
2ead48fb26 CPlusPlus: fixed parsing function-try-catch with ctor-initializer
C++ standard defines that 'try' should be before optional ctor
initializer, so wrong order changed. Added documentation to
parseTryBlockStatement and new test.

Task-number: QTCREATORBUG-9064
Change-Id: Id19cdc53c034cb1232ae27e0bfe36d85b7ad0452
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 11:31:28 +02:00
Lorenz Haas
f7de8c934a Hide 'Refactor -> Add Definition in ...' for signals
Since signals don't have a definition there is no need to show that
action under 'Refactor'.

Change-Id: Ic4d65b56c9197e2dbce5cedd5c760faea14d920d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 10:55:15 +02:00
David Schulz
0042175e57 Debugger: Fix compile of dumper test.
Doesn't compile on windows because of
ambiguous symbol GdbEngine.

Change-Id: I4cdad73f249d18e5721066cf0929b0990209d961
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-09 10:07:17 +02:00
Friedemann Kleint
7377f4f515 Clean headers in QmlProjectManager.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I2d1d2ec5a3071de9d2a0a03bc69ec653becc7f85
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-09 09:12:23 +02:00
Nikolai Kosjar
6522e3eafc Build fix for cplusplus-update-frontend and cplusplus-mkvisitor
Change-Id: I120b47c0af14afec01b653a01baac78d6ca8a78e
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-09 08:30:09 +02:00
David Schulz
aae5f4c8d8 cdbext: Fix dump of QDir.
Change-Id: I863c45b9c54d39c2e879d9f4f4d080622348e1db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-09 08:25:07 +02:00
Lorenz Haas
82d6dd6f07 GUI enhancement for line number widget in editors tool bar
The L of "Line ..." and the right frame of the previous combo box are
glued together without any spacing which looks not good. Added half
spacing to save space and make the label good looking.

Change-Id: Id930171be7a2f7885ab633eec8082057bc726227
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-09 08:05:07 +02:00
Petar Perisin
c49fe8350d Git: Add a function for getting current local branch
Change-Id: Ibda70cb896633cc7afa3a845b99aac523246c558
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-08 19:23:47 +02:00
Alan Alpert
30f2418926 Export TypeDescriptionReader
Allows use in external tools. Unsupported still, but possible.

Change-Id: I947adc6a6dbccf676112ac77e186134fb660efd2
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-04-08 19:08:18 +02:00
Friedemann Kleint
aba13e37bc Fix compilation of QML Designer.
Breakage introduced by bb13b8d65e .

Change-Id: Ib3b13167f5ada0e406275cb4ff4dddfedc222345
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-08 17:12:49 +02:00
Tobias Hunger
e5556f5b5b RunConfiguration: Add method to add individual RunConfigurationAspects
Change-Id: I6ed2e2ae673840ff4340eedd96fe5019ab495679
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-08 13:43:47 +02:00
Eike Ziller
44cc98c95f Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2013-04-08 13:26:59 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +02:00
Tobias Hunger
ea23948efb CppTools: Use namespace CppTools consistently
There were quite a few classes using CPlusPlus namespace in the
CppTools plugin. Rename them and do some other small namespace
related coding style fixups.

Change-Id: I093fc1f3fc394fd9923e3f18d5f66522e288f21d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-08 13:21:31 +02:00
Tobias Hunger
ff3bf32435 Fix margins of QmlProjectRunConfiguration in Project mode
Change-Id: Ice9e1256ca10b66de065495080cdf121e4e19279
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-08 13:19:56 +02:00
hjk
2d2a89941c Debugger: Populate parts of Modules view with LLDB backend
Shared objects seem to get reported twice by LLDB.  Ignore that for now.

Change-Id: I1d49200a54f10ea8a2768e4dd623541a3d4f80e7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:49:05 +02:00
hjk
1d808ea8bc Debugger: Populate stack view with LLDB backend
Change-Id: I9808829559da65cd152d2455737f6c7f394da6b3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:48:52 +02:00
Marco Bubke
bb13b8d65e QmlDesigner: Fix memory leak because of template magic
Be careful if you use a private smart pointer.

Change-Id: Ia78583b080c8d936d98517c55d3294d3040f8cdb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-08 12:47:10 +02:00
Eike Ziller
8b5b2e43eb Allow jumping to column with Locator filter.
With the line number filter with "<line>:<column>"

Change-Id: Ie8832fb1e218fe78cc40885da24716e844974924
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-08 12:42:31 +02:00
hjk
7107fd1591 Debugger: Pass output from plain gdb pretty printers hex-encoded
This takes care of "unusual" contents.

Change-Id: I5e9ce2066281d169e88a58e85e6d4dd590760e2a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:27:59 +02:00
hjk
066efcd6a6 Debugging on Android
This implements the host side of
https://codereview.qt-project.org/#change,50290

Change-Id: I13c7df29534a2a85202c2b295b139896443b0120
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:05:44 +02:00
Thomas Hartmann
63f3a51060 QmlDesigner: for new code use QPointer instead of QWeakPointer
QWeakPointer is deprecated for tracking QObjects in Qt 5.

Change-Id: I3e9089b25f43b42a478aa4cd4073cbdfd0da3823
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-08 11:52:25 +02:00
Erik Verbruggen
4b199b06d5 Fix use of std::make_pair so it compiles with C++11.
Compiler error:

../3rdparty/botan/botan.cpp:21912:17: error: no matching function for call to 'make_pair'
         return std::make_pair<struct dirent*, std::string>(dir, m_cur_dir.second);
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/bin/../lib/c++/v1/utility:444:1: note: candidate function [with _T1 = dirent *, _T2 = std::__1::basic_string<char>] not viable: no known conversion from
      'struct dirent *' to 'dirent *&&' for 1st argument
make_pair(_T1&& __t1, _T2&& __t2)
^

Change-Id: I1a8782956cf0a105fe2f12bf6f8470242a54a3a5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-08 11:51:56 +02:00
Petar Perisin
0dee89bac1 Git: added rename branch
Change-Id: I327a2bc91b871dc03797d9af52bb2d32be8e76d2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-08 11:25:46 +02:00
Erik Verbruggen
2d50011716 C++: pre-allocate the output buffer.
This prevents a whole lot of re-allocations when the output byte array
needs to grow. It also prevents some heap fragmentation for big files.

Because the preprocessed output is short lived (it will be parsed
immediately after, and then discarded), it is not squeezed to the
minimal size. This would result in another allocation.

Change-Id: I4974be5144f88cdfc4ddc9d8330200725aa90803
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-08 11:20:55 +02:00
hjk
1d580bcf9f Debugger: Remove workaround for GDB < 7.2 missing frame.block
This practically means that the >= 7.2 requirement is now a hard
requirement.

Change-Id: I6c3abbc625443ded182d2da101e04d96e3bed26d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-08 10:56:37 +02:00
hjk
ecbdc68c96 Debugger: add some food for the threads view in the LLDB backend
Change-Id: I6d8ea11d6c6e1206e5d1c3f13a51ae0521f25a85
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 10:56:22 +02:00
Orgad Shaneh
d63e38b021 Git: Fix breakage in parent commit lookup
Broken by fe1f7e4bf6

Change-Id: I8212b306d52ee96320a0b14f6f616b48aa928703
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-08 10:43:28 +02:00
Petar Perisin
9dce1fe429 Coding style modifications
Change-Id: I098cbde76e844229f189eb05d0e0b5013af8c5fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-08 10:33:14 +02:00
Christian Kandeler
a167286b3f Ssh: Get confirmation from user for overwriting an existing key.
Change-Id: I3d74423ef647fd59d303517b0a0e987b24973095
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-08 10:28:08 +02:00
David Schulz
6c12a06029 Editor: Added Dialog for read only files.
Task-number: QTCREATORBUG-2851
Change-Id: Ic47a5a1833650e31b4e27d0a01259d6b398a6415
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-08 10:16:11 +02:00
David Schulz
f9c31b4c6b Debugger: dumpertest: Dump expanded locals
...separate for the cdbengine. Workaround for
all symbols with virtual children.

Change-Id: I166b30af6594bde1093896156d86b28f02ed8a6a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 09:35:28 +02:00