Commit Graph

25792 Commits

Author SHA1 Message Date
Christian Stenger
a792576a09 Squish: Fix for modified and new project template
Change-Id: I352a7164391531b6cb48facfb83e56bfadf3c21c
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-05 15:26:38 +02:00
Daniel Teske
7657dd3a47 Add error string to IRunControlFactory::createRunControl
And add a few helpful error messages

Task-number: QTCREATORBUG-7826

Change-Id: Ia9f9fa476cecf2cff198bc460408bc062e119338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-05 14:38:51 +02:00
Leandro Melo
c5097ed183 C++: Fix crash in auto deducing mechanism
There was an inconsistency, since the AST used in ResolveExpression
was not really the same previously computed. In the particular issue
below a crash could occur, for example, when using auto in a for
range loop.

Task-number: QTCREATORBUG-7828
Change-Id: I02958f434c3cf3b50609546003fc141674ee78d5
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-05 14:34:59 +02:00
Christian Stenger
efa91f005b Squish: Fix for renaming Targets to Kits
Change-Id: Ia3faec39499bc7e65d5d0a0fb7963fcb4016c6d5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-05 13:55:21 +02:00
Orgad Shaneh
948abf10ae GCC: Actually use sysroot for header path detection
Function signature was prepared for that on
4c6b794774 but it wasn't really used

Change-Id: I1ee7059a00f0441d42a117b8f8d2c8c776d93815
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-05 12:18:33 +02:00
Orgad Shaneh
77b3de44e2 MSVC: Detect C++11
MSVC enables C++11 features by default. Only the version matters

Change-Id: I5c0c27326a876c7755a7608692fb03b8798b5634
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-05 11:11:32 +02:00
Friedemann Kleint
777d809397 Make ToolChain::suggestedDebugger() const.
Change-Id: Ic166f5b7af55b12a1578e130a29fbe81e5ecad0a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 10:59:58 +02:00
Orgad Shaneh
7eb5080f25 GCC: Detect -std=c++11 and -std=gnu++11 as C++11
Change-Id: I9f968c976c40578bf6aeef2392b5c560775353ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 10:45:25 +02:00
Orgad Shaneh
3cecc93f1c Fix Windows build
Change-Id: Ia6efab53a04a54869c3ac8700eef5a64ffd95e7b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 10:22:14 +02:00
Friedemann Kleint
a54056dacb CMakeProjectManager: Windows build fix.
Profile p -> Kit k in #ifdef Q_OS_WIN.

Change-Id: I6701b7c4c68770323d7b66ba2058861aa16f1cdc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-05 08:21:57 +02:00
Tobias Nätterlund
f8954ab962 QNX: Fixed compilation for BlackBerry QtQuick2 template
Change-Id: I5c15c6c6ac69dbf46f676d4f330ed75a2f923c85
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-09-05 07:34:52 +02:00
Alessandro Portale
8d6566b68b QtQuick 2 Application Wizard
This patch adds a new variant of the good old ugly
QmlApplicationViewer wizard. The new one is QQuickView based,
and thus targets QtQuick2

Change-Id: I049223f644029e75bd15120b003c0ce4907a547a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-04 20:32:33 +02:00
Orgad Shaneh
489132640f Fix qbs build
Change-Id: I5c2ddacab09b7e1ff997686d21a8b5aa193e1aa3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-04 17:23:34 +02:00
Robert Loehning
3767ecf872 Squish: Updated class for new target name
Change-Id: I5eca3251b290e15eaa2a462bc22f1d1ac7153834
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-04 17:13:59 +02:00
Tobias Hunger
cc275c062d Polish targetsetuppage
Task-number: QTCREATORBUG-7740
Task-number: QTCREATORBUG-7739

Change-Id: I587b22fcd5a21b1aa740d2e301da969519de0e45
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 17:10:33 +02:00
Tobias Hunger
371e6f59bc Rename some more profiles to kit
Change-Id: I898e7d4dec9b4de2c6f244f7b41ce71c82a4eee0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 17:09:28 +02:00
Christian Stenger
203b03f823 Squish: Fix for missing scrollArea
Change-Id: I5419b30b8dd0cc67af4d54a3bb89edd5368cb983
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-04 16:53:28 +02:00
Daniel Teske
7ea3e2c2de Make target selector popup size smart
Task-number: QTCREATORBUG-7705

Change-Id: Ica9a39f0557993a8bba6ec32f7373101203af4c0
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-09-04 16:24:18 +02:00
Orgad Shaneh
1faea8a0b3 Read-only file dialog: Use VCS terms if applicable
Also add keyboard accelerators

Change-Id: Icea8af6af7e5d94623ba7782c375977bbab17f22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-04 16:02:23 +02:00
Leandro Melo
6750a1c829 C++: Fix crash when deducing auto (with invalid ids)
Task-number: QTCREATORBUG-7801

Change-Id: I61436148ed1428a50a6840ba9109310a57dabaa4
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-09-04 15:35:01 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Eike Ziller
328d205b62 Device type + tool chain + other settings -> Kit
We called that "Target" before

Change-Id: Ie0d673c643947c26ac2706907f6250fc1739388a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-09-04 15:24:06 +02:00
Tobias Hunger
fb59a39a78 Fix saving of XML configuration files
... when removing settings

Change-Id: If85061321082a8cd0e35752f71d2498fd4693dfd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-04 14:21:01 +02:00
hjk
4e6bec0033 debugger: show newlines in QStrings also in tooltips
Not necessarily needed, but more consistent.

Task-number: QTCREATORBUG-7278
Change-Id: I6c72b90fa18514aecccee9aa2de3ee626e681b60
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-04 14:03:15 +02:00
Daniel Teske
867d655278 Qt4Project CodeModel: Use the project's mkspec not the qtversion's
They might differ if the user passes any -spec parameter

Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-04 13:42:29 +02:00
Daniel Teske
9e5c6518c0 Qt4BuildConfiguration: Allow relative paths for the build directory
Task-number: QTCREATORBUG-7791

Change-Id: Ied2dcd8f8ccb16f427d60c6f6b2d93afb4c4b7e4
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-04 13:42:05 +02:00
Daniel Teske
72fd0a416e Qt4Project: Also cancel code model updates on partial .pro reevaluation
It seems that not doing that was intentional. But not doing that
looks like an obvious bug.

Task-number: QTCREATORBUG-7783

Change-Id: Ide7c7be6711f64f9e8b87bca2fe35cb2722aa589
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-04 13:41:37 +02:00
Daniel Teske
51433cbd84 QMakeProject: Set xqmakespec in addition to qmakespec
That's a workaround for not properly parsing the qmake command line.

Change-Id: I39e613b5419e8918b1120c6c2d782aab3b155021
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-04 13:40:22 +02:00
Kai Koehne
512aad281a Qt4ProjectManager: Fix translation context
Unify translation context introduced in 4dd31391a

Change-Id: I1ccea979d1b64647b74ace3466b6053a9e1397de
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-04 12:46:31 +02:00
hjk
25f00f99ea debugger: un-duplicate code
No need for a copy of Qt::escape.

Change-Id: Id4bf0b8d09485375a41a728f0cc6ceca91c9fb42
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-09-04 12:29:15 +02:00
Leandro Melo
903c3cafe8 C++: Improve lookup - collect more valid items
There was a fix for QTCREATORBUG-7730 in the case of nested
forward declarations in commit 74a458bca0.
However, it introduced regressions and actually didn't solve
the issue, since the behavior was hidden by another error fixed later.

The patch should properly fix the issue and the regression pointed
in QTCREATORBUG-7777.

Task-number: QTCREATORBUG-7730
Task-number: QTCREATORBUG-7777
Change-Id: I27397fefdc7cc9a60111761df1f76a01407886f7
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-04 10:09:16 +02:00
Friedemann Kleint
41a7d1c624 Unblock Maemo device test dialog on Qt 5.
Do not open the dialog with the wizard as parent after
QWizard::exec() has finished.

Task-number: QTBUG-27039
Change-Id: I6c04481b57b1b7bd5437012b6507c6618323159e
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-04 09:39:31 +02:00
Friedemann Kleint
0d11208036 Use parent directory as name for Qt version if directory is 'qt'.
Change-Id: I7a20eebadfda65aa68c1ff4f19c55b8a5e36559a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-04 08:20:17 +02:00
David Schulz
c3e7a9b830 Fixed signed int overflow in remotelinux plugin
Change-Id: Icf2a707a0195b1d197b7c965100a783f3e78f52a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-03 18:04:13 +02:00
Christian Stenger
ac6ca18ec0 Squish: Fix tst_create_proj_wizard
Change-Id: Ibccb5b6c1496d5ae4c9021086d55dc4236f6ac71
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-03 17:48:55 +02:00
Friedemann Kleint
347d0e4e5a Unblock device test dialog on Qt 5.
Do not open the dialog with the wizard as parent after
QWizard::exec() has finished.

Task-number: QTBUG-27039
Change-Id: I51d5d9fa07adca0570c2b91b50f84e143e592309
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 17:35:10 +02:00
Eike Ziller
e518cdd44b Mac: Add make target for code signing.
Use like this:
SIGNING_IDENTITY="My ID" make codesign

Change-Id: Id71547a7e5926c34b6dad22017b5005791419cf0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 15:45:32 +02:00
Tobias Hunger
7d5f164653 Build fix
Change-Id: I8810a779e6862fae2e3d9db0b9658295f8a772b5
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 15:37:35 +02:00
Robert Loehning
a426cadeec Squish: Added Fremantle target
Change-Id: I4c7d5a053d42693e658e82699e9339c1a72d0057
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-03 14:52:17 +02:00
Orgad Shaneh
856b7f15ab ClearCase: Support systems without external diff
CC's internal diff is worthless, just disable multiple files actions

Change-Id: Ia8541e6edc6582777fc141da849819a5a11543b6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-09-03 13:17:58 +02:00
Robert Loehning
b9c58161e4 Squish: Partly revert "Removal of Symbian support"
This reverts commit ae23d50576.

Change-Id: I03cccd11022b66e90489e23ab360704ba4a357cd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-03 12:41:27 +02:00
Orgad Shaneh
05b7a06bce ClearCase: Fix threading issues
* Menu parameters were set (and enabled/disabled) from non-GUI thread
* Access to statusMap was not thread-safe

Change-Id: I029cb7090af87903c599bb3fcc1cba93e196d45e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-03 12:24:51 +02:00
Orgad Shaneh
e371008cd1 ClearCase: Rename activityMutex -> m_activityMutex
Change-Id: I6bf87d313e5466ad782ed06662d5fe0039a79491
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-03 12:22:45 +02:00
Orgad Shaneh
b844181b39 ClearCase: Sort files in project
Change-Id: Ibd8c2b479fec45c841514c624755f55e922c411c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-03 12:22:37 +02:00
Friedemann Kleint
71ea54c036 Fix debugger detection when attaching from output pane.
Obtain RunConfiguration from RunControl add logic to
use the ABI if that fails.

Task-number: QTCREATORBUG-7677

Change-Id: Iebf053e6b7a25644a4d4c02b80bf952ef9e6a078
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 11:56:33 +02:00
hjk
73f5f71282 Improve "Configure Project" target settings hint
Make "Configure Project" help text link to options dialog depend
on the actual architecture instead of listing all possibilities.
Also, make the link work.

Task-number: QTCREATORBUG-7810
Change-Id: I78360cdc5b1a836b46dad5c31bdf7335d83e846e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-03 11:04:22 +02:00
Christian Stenger
f3e92100cb Editor: Fix transformSelection() for block selection
Task-number: QTCREATORBUG-7643

Change-Id: I26f9a3637a39a26e82b72de1143e31b5e55b076e
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-09-03 10:10:36 +02:00
Friedemann Kleint
a46f0520f8 Fix warning about empty file name when attaching from output tab.
Change-Id: I3a9def260c14944e6fd69fa87b0f1527b8efde3c
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:10:24 +02:00
Eike Ziller
67e9bdbd44 Fix Mac debugging helpers removing arguments from locals
Change-Id: Ifce34d5f51d863eca9e7497a8638703f32cecf44
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:04:51 +02:00
Friedemann Kleint
6886e485de Handle watching/tooltips of C++ editor tokens consistently.
For editor tooltips and the editor context menu
'Watch expression', always try to find a local variable first
and use its expression.

Change the tooltip manager/widgets not to rely on the debugger
model enum and obscure expression, filter by complete iname
instead. Remove obsolete enumeration.

Change gdb's handling of tooltips such that local variables
are displayed immediately without creating additional tooltip
items.

Change-Id: I9b55823428029ba50d84d3a8cab55eb58942e72b
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:02:56 +02:00