Commit Graph

25306 Commits

Author SHA1 Message Date
Christian Stenger
ec1fd75f7b Squish: Fix hooking into Qml project
Change-Id: I358a6ac7acacb44f23161019d3d2a83e5d6e84cc
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-24 16:36:42 +02:00
hjk
8d3c1cfb05 Rename FancyLineEdit::setHistoryKey -> setHistoryCompleter
similar for HistoryCompleter *m_completer -> m_historyCompleter

Change-Id: Ic7aedc19cbb865f0a5bdddb9565a7411fd06dfde
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 16:18:39 +02:00
Tobias Hunger
96d8009693 Fix saving of xml files
Do not save XML config files (profiles.xml, toolchains.xml, etc.)
if the file has not changed.

Change-Id: I5f0dea374b33a05e7c428f4031d53c83d92de595
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-24 15:48:40 +02:00
hjk
29ec32a531 ProfileChooser: make more robust in case of no configured profiles
Change-Id: I53945617cc616d2bfe4726b4e6e45cad7b400c44
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 15:33:09 +02:00
Friedemann Kleint
d39fc8088c tr()-Fixes.
- Message box titles.
- Profile->Target.

Change-Id: I9a977b28de948b16521758fd653ff3576ef72e8f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 15:32:19 +02:00
Tobias Hunger
13c10c8c14 Document PluginManager::initializationDone() signal
Change-Id: Ic340992afd3016b10a75dcd4a8dbd9da1b92b69b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-08-24 15:00:05 +02:00
Leena Miettinen
0cb83b1fff Doc: debuggers are no longer specified on this page
Make the text more about compilers.

Change-Id: If8c1529f2158b5a205afe4555f88cd1de1ba1e7e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 14:56:05 +02:00
hjk
a120210cdf debugger: simplify escapeCString
There was no real need for the QString based version after all.

Change-Id: I3ea64ba03164c97205fe5ee545fb53ebf44c7535
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-24 13:38:23 +02:00
hjk
88f5949e38 close down history completer interface
Change-Id: Iaeff40be410d1f0facd687632c9ce4897eb2e613
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:38:15 +02:00
hjk
903eeaf42f fancylineedit: enforce conscious choice between history or special completer
Change-Id: Ia667895b619d0bb37561dce348adb7269df2fb9c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:37:59 +02:00
hjk
ec6929434d utils: base PathChooser on FancyLineEdit
Change-Id: Ibf5e7ca866dca0816efda9f75af2cd17ac61c7c7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:37:44 +02:00
hjk
5ff302d87d C++: Escape strings before using them in CppRewriter regexps
Change-Id: Ia2aaf91c71e8406944085c5137b67317331cc898
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-24 13:37:32 +02:00
Friedemann Kleint
856621951d tr()-Fix: Add missing Q_OBJECT.
Change-Id: I439028151805ad2a8ea8c1c2d075fc0e7b4acaeb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 12:52:25 +02:00
Friedemann Kleint
e9cd29f7a7 CDB: Improve simple dumpers.
Retrieve data of Qt types with unexported private classes
from memory.

- Dump new string members of Qt 5's QUrl
- Fix QDir (faulty offset).
- Implement QDateTime.

Change-Id: Ie0524a531cd0afb3b8e058c2a0a0bf9616078357
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 12:51:59 +02:00
Friedemann Kleint
dd69bb67f7 Compile fix (QT_NO_CAST_FROM_ASCII).
Change-Id: Id43f23bdd70b7cbb30a0dc7a20f98508244135df
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 12:50:40 +02:00
Daniel Teske
36f6c02f1c Remove evaluateBuildSystem signal
It adds almost nothing and introduced some bugs.
This fixes:
Double evaluation in cmakeproject on build directory changes.
Wrong runconfiguration update in cmake for set_target_properties(target
PROPERTIES OUTPUT_NAME [..]) changes.

Unecessary runconfiguration removal in AutoTools and Generic projectmanager.

Reevaluation of .pro files on changing the active runconfiguration or deploy
configuration.

Task-number: QTCREATORBUG-7723
Task-number: QTCREATORBUG-7761

Change-Id: I50249b186917cd3a4f399f187f09ac8428ab6f9e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 12:13:48 +02:00
Daniel Teske
8d8ab020b1 Make buildDirectoryInitialized a Qt4Project specific signal again
And fix it to the old behaviour while at it.

Change-Id: Ifd786e085c621fb3cd59b98cc665d9e3c7fcce51
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 12:13:36 +02:00
hjk
c23bf0daa5 debugger: use gdb again to read executable file name from core
Change-Id: I035d1260c5cf08d4a65adb4494a5f83045effecf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 11:55:35 +02:00
Tobias Nätterlund
526c2bfe7e QNX: Fixed starting executable when debugging on QNX Neutrino device
An updated version of gdb for QNX does not support "-exec-run" with path parameter,
while "run" still works.

Change-Id: I86bbe3ef2247809e56416ed641df5bc8e165fddd
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 11:51:46 +02:00
Tobias Hunger
61e95e9a99 Replace some QStrings with Utils::FileName
Change-Id: Ia96963b90788250b4bc6bc89c2bb697de103535f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 11:27:05 +02:00
Tobias Nätterlund
a03c2d2f3d QNX: Fixed signal-slot connection
Change-Id: I03c9b3094b156e76e9f6bfaffed41585df68b38c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-24 10:55:47 +02:00
Friedemann Kleint
5b69bee198 Use QT_NO_CAST_FROM_ASCII for debugger plugin.
Fix gdmi escape routine by using a traits class to adapt
QByteArray/QString.

Change-Id: Ic6d2a0c927e4613aec9f69095bbb04a393e9edb9
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:46:25 +02:00
Christian Stenger
2cd6db04bf Squish: Fix breakpoint line number
Generated main.qml has changed.

Change-Id: I697e9346e2fc45f5c5423b2f9d9892a601a38c75
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-24 09:37:58 +02:00
Friedemann Kleint
9ffe031060 Fix error handling when killing Windows processes.
Similar to Unix.

Change-Id: I967da0eb461e63505e4b47b5fcf6de0df6256e94
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:30:57 +02:00
Eike Ziller
5a895d4fe5 Rename "Tool Chains" option page to "Compilers"
Currently it contains compiler settings only, so there's no
need to let people search for e.g. debugger settings there,
that might be considered part of the toolchain, too.

Change-Id: I458f3d1cf1784b85820f8af7604a2a004372a909
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:26:51 +02:00
hjk
a110c98d08 C++: Use soft asserts in CppRewriter
While a "real" C++ type rarely contains parantheses or other
characters that are "special" for a regexp, gdb happily
sprinkles in things like "(anonymous namespace)::".

Killing Creator while trying to beautify such a name
is inaccpetable.

This should be followed up by patches handling the known
problematic cases properly.

Change-Id: I8cc8509f1d7df0a8780876cdba556e1cf7ec4a95
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-24 08:55:57 +02:00
Eike Ziller
fc49c03a63 Merge remote-tracking branch 'origin/master' into 2.6
Final merge of master into 2.6.
2012-08-24 08:42:02 +02:00
Friedemann Kleint
78aa94c8c6 Debugger: Improve engine detection.
Remove the RunConfiguration parameter from guessCppEngineType()
and use the DebuggerStartParameter::toolChainAbi only.

Use fillParameter() to set the debugger command and toolchain
in order to prevent mismatches.

Add logic trying to figure out the profile to fillParameters()
in case the profile passed in is 0 for the command line cases.

Use CDB matcher for post mortem and Remote CDB, fix it to
prefer 64bit CDB on 64bit OS.

Change-Id: Icedc3883fe15660303060498ab609957e6d01cd1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 17:20:50 +02:00
Marco Bubke
b80205c592 QmlDesigner: Remove private class for SubComponentManager
Change-Id: Id56143ee936cf07d38df59e4badec00a3a570c26
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-23 17:02:42 +02:00
Marco Bubke
26630c3de0 QmlDesigner.Tests: Fix formating
Change-Id: I466a0e808fc7da8516421ee46c1a09ca1d0a0144
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-23 17:02:33 +02:00
Marco Bubke
88d00c45be QmlDesigner: Change QMLFILEPATTERN to s_qmlFilePattern
Change-Id: I5fb2faca0b7322908ae7abb7633627b113035dbc
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-23 17:01:56 +02:00
Leena Miettinen
fd8de2f48d Doc: some cleanup after the Symbian target removal
Fix next and previous links, remove links to obsolete
topics, add a note about removed Symbian support.

Change-Id: I585e3cf868df6310c06465ea826c29d1b977e188
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-23 16:46:14 +02:00
Kai Koehne
0cff59f044 QmlProject: Fix compilation failure
Fix breakage introduced by Iaff13619

Change-Id: I1123f34d0bfb70049d6ee584ef7cb3bd94c48c55
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-23 16:34:51 +02:00
Kai Koehne
6a92ea63e8 QmlProject: Support both qmlscene and qmlviewer in run configuration
Provide both qmlviewer and qmlscene as run configurations if the active
Qt version is 5.0.0.

Change-Id: Iaff1361921bdd2d6b2256c4c4cb51e96802c2519
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-08-23 16:05:44 +02:00
Kai Koehne
4dd31391a2 Qt Versions: Differentiate between qmlscene and qmlviewer
Qt5 features both qmlviewer (QtQuick1) and qmlscene. We can't just
assume that everybody wants to use qmlscene.

Change-Id: I6668b7776869826575ce035f1e9ace47908013ff
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-23 16:05:34 +02:00
Eike Ziller
bc67246432 Merge remote-tracking branch 'origin/2.6' 2012-08-23 15:52:15 +02:00
Friedemann Kleint
6a56990302 Introduce static localProcesses() method to DeviceProcessList.
Add synchronous static getLocalProcesses() (platformspecific)
method to LocalProcessList, use that for the model, simplifying
the code of doUpdate(). Use that for
DeviceProcessList::localProcesses().

Polish the proclist-method for UNIX a bit such that it tries
to read out the 'cmdline' first to obtain the complete
command line and full path to the executable.

Similarly, set the absolute image path on Windows.

Implement doKill() on Windows.

Change-Id: I3a5b990eaa9f6beb4c589406bdf4c7a234e40734
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 15:41:16 +02:00
Friedemann Kleint
aee8f8832b DeviceProcessDialog: Introduce methods for modal/non-modal use.
Add methods to be able to use the dialog as a non-modal
dialog showing a list of processes or a modal-dialog
for selecting a process.

Connect double-click to 'Accept' for the modal
case (regression from 2.5).

Change-Id: If05a1c40ee6a41135d943e9919a1250db03eeffb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 15:40:13 +02:00
Leandro Melo
009d6b1e2f C++: Handle C++ style comments in macro expansion
Notice that a similar problem still exists for which we
need to fix the lexer when there's a C style commend which
 ends with a backslash-newline.

Task-number: QTCREATORBUG-7713

Change-Id: I0f6d561703984f917fa5ed29de020ad0bdc5aaf0
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 15:00:53 +02:00
hjk
08cc1e7d6a historycompleter: make key explicit
Change-Id: I1560e379639a02a2decf46c4e6b015bd6042c6b7
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 14:59:14 +02:00
Daniel Teske
ebad441d70 RunSettingsWidget: Fix combo box index handling
Change-Id: Id469c958450ff94024b5fbb933e2bc5e04c94006
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-23 14:56:13 +02:00
Daniel Teske
f7acbc5854 RunSettingsPage: En/disable Rename button correctly
Change-Id: I052961575f5ccc423a751ad28c5547003967663b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-23 14:56:07 +02:00
Daniel Teske
9489496c0a RunSettingsPage: En/disable "Remove" button on changes to the target
Change-Id: Ie3cb734b99e468e6fa56265ac59992bb8402f33a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-23 14:56:00 +02:00
Tobias Hunger
e9f7fb93a2 Allow qmake to work even if toolchain libraries are not static
Task-number: QTCREATORBUG-6576

Change-Id: I49f458181a3ba0697a096b2a6435838fbcdbc759
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-23 14:53:56 +02:00
Leandro Melo
74a458bca0 C++: Improve completion when forward declarations present
This fixes one of the issues mentioned in the report below.
THe other part will come in a separate patch.

Task-number: QTCREATORBUG-7730

Change-Id: I9f56a9bcec8a881dab3ab60f40c5b71f296466da
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-23 14:36:01 +02:00
Leandro Melo
b53d562816 C++: Take multiline strings into account when preprocessing
It was creating extra line(s)...

Change-Id: If28a9ccf16195c71747479db838a5589ea6683a0
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-23 14:35:53 +02:00
Leandro Melo
e148d030f5 C++: Introduce C++11 raw string literals
Although they are now supported by the lexer
and parser, it is worth to remind that we still
need to address an issue concerning the highlight
of multiline literals (which with the advent of
the new raw strings will become more common).

Task-number: QTCREATORBUG-6722
Change-Id: I137337a9ac0152a1f8b9faded0b960c6fe3dd38a
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-23 14:35:02 +02:00
Leandro Melo
15a67c41c3 C++: Fix regression when binding qualified names
This was introduced in function extraction refactoring intended
to fix an issue with invalid class names: a66e344b42
The patch fixes only the regression itself - the previous fix
is correct.

The report below consists two parts. The other one is not a
regression but nevertheless is fixed by the previous patch.

Task-number: QTCREATORBUG-7730
Change-Id: I6f65584902619b542c9ce56cd0f37218a3d50104
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-23 14:32:58 +02:00
Leandro Melo
11f6ae4a14 C++: Completion for templates as base classes
This fixes a variety of issues regarding class completion
when templates are used as base classes. The test cases
show examples.

Task-number: QTCREATORBUG-4357
Change-Id: I764d5ce817a78e1b19336e5beab758ca9e10f34b
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-23 14:31:42 +02:00
Daniel Teske
7747c3c663 Remove unused member
Change-Id: I1f801bee3c646585e39a481c8bf271c115a7189c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-23 14:06:14 +02:00