Commit Graph

24819 Commits

Author SHA1 Message Date
Daniel Teske
bb66e54626 Creating profiles: Set toolchain before the mkspec
The mkspec setting function checks whether the value is the same as the
default, but the default depends on the toolchain.

Change-Id: I2ff55efbf365617b117301224e23d616dc7db25e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:44:32 +02:00
Daniel Teske
efe466d08e QmlProject: static_cast not qobject_cast
Change-Id: I8104dab231a183a7768b3c1ac8c34b7ba4e47fdb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:41:16 +02:00
Daniel Teske
f9923a30be Qt4Project: static_cast not qobject_cast
Change-Id: I76483e6aae8b5144f9f896b3c60795e3ae5ade11
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:41:02 +02:00
Daniel Teske
1190ba1766 Qt4ProFileNode: static_cast not qobject_cast
Change-Id: I0b8f168be6e85888b02a11682c21e7b63a33f75f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:40:41 +02:00
Daniel Teske
0190c27392 Run QMake, static_cast not qobject_cast
Change-Id: Ib9be214838d8e10dbd1a870d894bf7485265a43e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:38:01 +02:00
Daniel Teske
87e76e7e51 MaemoRpmPackageCreationStep: Change back to use '/' instead of '\'
That is on Windows.

Change-Id: I2f6e9e0118e2deb3238e73479a3160536857a372
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:37:43 +02:00
Daniel Teske
b64e3e6235 CMakeProjectManger: static_cast instead of qobject_cast
It's a CMakeProject, it must be a CMakeBuildConfiguration

Change-Id: Ibd0907112661a89f7ca84ffdf62a1dbcbd436ed8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:37:19 +02:00
Daniel Teske
95d7dd6231 Qt4: static_cast instead of qobject_cast
Change-Id: I6a09b19c18ecb5d643ffad874f1138a7f24ab295
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:34:05 +02:00
Daniel Teske
b09e566375 CMakeBuildConfiguration: Less qobject_casts more static_casts
CMakeBuildConfigurations can only exist on CMakeProjects

Change-Id: I8501e39f133fea854b953f9739e001cae1f2c0ea
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:33:52 +02:00
Daniel Teske
ed42fb2e3c Remove never called removeUnconfiguredCustomExectutableRunConfigurations
Change-Id: Ieb8bb1ec3ad9a4a68ae1c95fe1b3effff386c605
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:24:26 +02:00
Daniel Teske
aceffa65e3 Remove left over qt4desktoptargetfactory.cpp
Change-Id: Ie7dbadb709d04da01c48d736a0bc91856e9304cc
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:23:38 +02:00
Daniel Teske
09b5aa6eb2 Remove duplicated includes
Change-Id: I113e4c2afc6c881bc9c62f7ff08dbc69005037a5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:23:25 +02:00
Daniel Teske
c63dd913a9 Make AndroidManager completely static
All the methods are static now, so there's no need to instanciate the
class.

Change-Id: Ibb615f1f863ed1ad8e27dfb44d69998ea1061550
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:22:58 +02:00
Daniel Teske
560abd6109 CMakeRunConfiguration: Check once with object_cast for CMakeProject
And then use that knowledge to simply do a static_cast

Change-Id: Ia145468235ed0b75ed243d6ae2d76ab824df2958
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:22:46 +02:00
Daniel Teske
28f71d6ae9 Remove CMakeRunConfiguration::activeBuildConfiguration()
It's the same as RunConfiguration::activeBuildConfiguration

Change-Id: I117edbe2347dd40b183ba7e9d2f6ace08645db7e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:21:46 +02:00
Tyler Mandry
fcd01af143 Android: Add QML debugging support
Change-Id: I2fb2c75001569385e417ea44ae90d34e92a22449
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-17 23:47:31 +02:00
Montel Laurent
70ce95b44f vcsbase plugins: Fix mem leak
We must delete private class which delete m_ui too.
OTherwise we will leak here

Change-Id: I39239ce2fdddd4fe4e4e748673e271bba976c712
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-17 23:42:24 +02:00
Orgad Shaneh
6a17546e5f Debugger: Profile -> Target
Change-Id: If65d7c385eb86a54a4a9bdf51be5b2bf1c3cb429
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-17 23:36:35 +02:00
Francois Ferrand
e203893fd1 Add function return type in outline.
Append the function return type in outline (after arguments), consistently with
variable type indication.

Change-Id: I1cc6d69634fc83227eb7fc9e3a0ee2ad6ca6ace8
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-07-17 19:05:43 +02:00
hjk
b44e0e1a23 use QT_BEGIN_NAMESPACE instead of QT_FORWARD_DECLARE_CLASS
Less confusing to the highlighter.

Change-Id: I1c5f232da42b18d43f6c14b5907eb8feb48de2b4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 17:17:31 +02:00
Leandro Melo
441c652ce5 C++: Change back highlighting of types
The type highlighting change part of the recent patch
4a2a17af8a didn't seem to
please much from a visual point of view. It's a better
idea to keep the type highlighting as it was for now
and in the future try again the approach with an explicit
option and perhaps a more restrictive context.

The other patch is not reverted entirely because it does
fix a couple of bugs.

Change-Id: I806afa3d8c1c4b241080b8704255d737f61ee12c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-07-17 16:23:52 +02:00
hjk
9b5afad239 projectexplorer: improve spacing in profile selection dialog
Change-Id: I9f6719618749b57cdfb68457e9ede8a580abd1af
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 15:19:04 +02:00
hjk
71bb045520 projectexplorer: de-pimpl ToolChainConfigWidget
It contained only two pointers. Not worth the overhead.

Change-Id: I512ddfe588b8d072072b8155b4418a2b8e8c4da0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 15:18:40 +02:00
hjk
28b5c1deec qtsupport: hide Qt version data on tree nodes without such data
Change-Id: I075f0962f59d34ea48b7d63753505ddc6bea5dd4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-17 15:15:34 +02:00
hjk
a997fbfba9 profiles: better distribution of spacing in the option page
Change-Id: I672c1a24ce7a3f6e3d7538550d0289ca8f4df865
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-17 15:14:55 +02:00
hjk
d8b714b99e profiles: some variable renaming (st->profile)
Change-Id: I06da18c8db724e9dbb27878e9280b78b6df299cb
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 14:15:39 +02:00
Leandro Melo
4a2a17af8a C++: Changes in semantic highlighting
- Fix issues with virtual/non-virtual destructors. They were not
  being correctly identified in some cases - in particular on certain
  uses in derived classes.

- Since now we do have a highlighting item for regular functions,
  constructors and destructors are now highlighted as such. This is
  more semantically correct and actually makes navigation and readiblity
  more distinguishable, since it cleary differentiates the type itself
  from its uses in expressions and declarators. (This seems to be what
  other IDEs like Eclipse, Visual Studio, KDevelop are doing.)

  NOTE: There's a switch to disable this item in the case it doesn't
  get good acceptance. Actually, the switch can be made a user
  setting...?

- Change the default color scheme so regular and virtual functions
  have the same color (virtuals continue to be italic). This makes
  sense given the above mentioned changes in constructors/destructors
  highlighting behavior. (In other schemes virtual funcions don't have
  different color, so this shouldn't be necessary in those.)

- Small renaming: "members" are now "fields" - consistent, since
  they apply for data and it's the term used in the UI.

Change-Id: Ib1aa9c0bbf28a31d09f5696460b0095fbe29de80
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-07-17 13:53:19 +02:00
Orgad Shaneh
187ac69a5f move ProfileChooser from Debugger to ProjectExplorer
Change-Id: I5a4dcd5b9101118de8c88b6d26af5a9dbb32ba54
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 13:15:29 +02:00
Eike Ziller
5e3998dd16 Make Plain C/C++ wizard more consistent over platforms.
Since it creates a console app also create a bundle-less app on Mac.

Task-number: QTCREATORBUG-7304
Change-Id: I00749f0d8a4c02bd80d4e7468b3abea552db23dc
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-17 12:54:02 +02:00
Montel Laurent
f0a0b9e903 plugins genericprojectmanager: fix mem leak. m_ui was never deleted
Change-Id: I50f98cdfb9372a1a1f78b7c8fe0ad7f39856ea01
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 12:04:10 +02:00
Sergey Shambir
edabcb40fa Added tooltips on completions proposals
Change-Id: Ic22b99e25159edfa4977e13c98f334ce75809af7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-17 10:19:43 +02:00
Daniel Teske
f43c02d12f Use mkspec of the Qt version of qmake when matching profiles
In case the qmake-line does not contain a mkspec argument,
use the mkspec of the Qt version found by matching the
qmake binary.

This reduces the duplication of targets/profiles when opening
new projects.

Change-Id: I647e166ae0322fd093967abea760197cf4c7eedd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-17 09:12:36 +02:00
hjk
1be3ad29df qt4projectmanager: fix crash on importing same directory twice
Change-Id: Ia4a4a1fa9f212464ab6836ce9a17734ed2d60758
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 18:46:04 +02:00
hjk
d1aaa4589e projectexplorer: fix crash on removing last profile
Change-Id: I1ad59e4cba107d6c0cd7f777648d6d2aba483b6c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 18:45:51 +02:00
hjk
a5fb852b7c projectexplorer: prevent crash on complex setting changes.
When Qt Versions and Profiles are removed simultaneously, the profiles
cannot be updated anymore.

Change-Id: I2022fb701d4d9f0704dda6a83c8f53b8add61c14
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 18:45:37 +02:00
Friedemann Kleint
7c8070afec Fix warnings about id being construct from 0 or empty string.
Change-Id: I7776b9035a2decc5e840e0d534d05b42c821e9f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 16:25:13 +02:00
Daniel Teske
c6bd83875e Fix crash on removing the profile of the last target
The active target is then null, thus calling target->project() crashes

Task-number: QTCREATORBUG-7633
Change-Id: Ia0804b9293b184528d5d949fa30b35877622e65d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-16 16:10:59 +02:00
Montel Laurent
a42ed223cd debugger gdb: fix mem leak (m_ui was never deleted)
Change-Id: I7be846fce3df6ed264954a379a4984666c8dfb06
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 15:46:53 +02:00
Montel Laurent
ae2e6116bc lib sshkeycreationdialog: fix mem leak. m_ui was never deleted
Change-Id: Ia175dc825b2e8bf2cead5728b64323d03a4d8e4b
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-16 15:40:08 +02:00
Orgad Shaneh
9117c6b059 Debugger: Fix "Attach to Remote" dialog
Change-Id: Id59289afb7d74ea150394cf4ddce2a4be56d10d6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-16 15:19:04 +02:00
Daniel Teske
440f0c2b0a Remove warning
Somehow didn't correctly amend the last commit

Change-Id: I004f70e810df9b8501e81d7e847933472fc35ebf
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 15:14:25 +02:00
Orgad Shaneh
19fa243ef7 Dumper: Fix Qt namespace resolution
qqNs should not be called directly

Change-Id: I845b5c1b9af3fbf79bac7a5ab85dc054678e3e53
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 15:01:29 +02:00
Daniel Teske
fba821f5c1 Project mode: Fix crash on removing the last profile
Change-Id: I0624e52a9fd176847a42a1a3379ceabc0f03661c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 13:09:23 +02:00
Daniel Teske
113bd5ce7e UnconfiguredProjectPanel: Fix crash if there are no profiles
That can happen, since the default profile is now manual and can be
deleted.

Change-Id: Id9274351e800ba88d7050ca7cd036cfc227a899a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:44:01 +02:00
BogDan Vatra
1a5edbaff9 Make const the functions parameters
Change-Id: Ie02e3bc3cb09734164f573a0af53e4e1a5e99402
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:41:53 +02:00
Friedemann Kleint
29a65750f6 Fix tr() error in Android plugin, use QT_NO_CAST_FROM_ASCII.
Change-Id: I7ccc55c914b4d5447ad238acfb2ff76cc28d6b23
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:40:21 +02:00
Montel Laurent
2cdfad5539 project manager: delete private class (fix mem leak)
Change-Id: If6543e49d5ed3107230dcded2a2117614be190af
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:37:28 +02:00
Montel Laurent
d83fda1c38 remote linux: fix mem leak
Change-Id: I0b421ae53f7651baa2d7c804379c012c6b78201f
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:37:04 +02:00
Montel Laurent
1904aa45b3 remote linux configuration: fix mem leak. Private struct never deleted
Change-Id: I1288847fc905b2bbe24108cb6f1c1f6c4b2757b3
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:34:36 +02:00
Friedemann Kleint
ec9809e657 Fix tr() error in QNX plugin, use QT_NO_CAST_FROM_ASCII.
Change-Id: I44e34b62d16e824939b75d02738f58fd8e3380a7
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:33:42 +02:00