Commit Graph

28971 Commits

Author SHA1 Message Date
Kai Koehne
6902ee2617 Debugger: Fix warnings on qt creator startup
Predefined entries like "Locals" do not have a value.

Remove asserts on every startup:

SOFT ASSERT: "!result.isEmpty()" in file
/home/kkoehne/dev/creator-2.8/src/plugins/debugger/watchhandler.cpp,
line 956

Change-Id: I16b97c61256c6083440b9fa228113be9d0867e5d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-02 13:26:56 +02:00
Oswald Buddenhagen
a7bcfaf03e add src/shared/ to INCLUDEPATH
this is needed to make self-contained wrt the proparser dependency.

Change-Id: Ia9d0a7a3cfe0d7f022811559261bede42fa7c57a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:21:15 +02:00
Oswald Buddenhagen
c61210089f define QT_CREATOR centrally
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.

Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:20:37 +02:00
Oswald Buddenhagen
629e05ea1b add missing defines to QtSupport ProductModule and rely on their presence
Change-Id: I21b14aa75928f35d35853f6d93e8bd58a653153b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-02 12:20:24 +02:00
Oswald Buddenhagen
8fcdd3441d move qtsupport defines to qtsupport_dependencies.pri
they are used in both the plugin itself and in the plugin's .pri

Change-Id: I6547178e597b370c0a8aa29f69072c8119d1382a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:19:49 +02:00
Oswald Buddenhagen
7ce3362288 automatically include libs' and plugins' _dependencies.pri files
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 12:19:31 +02:00
Oswald Buddenhagen
8dd616f387 move ssh dependency to projectexplorer_dependencies.pri
it belongs there

Change-Id: I54fe70841c04289577af67d08fc2b1f8c24cb0ac
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:17:15 +02:00
Oswald Buddenhagen
962f0c478f move qmldebug dependency to debugger_dependencies.pri
slighly breaks modularization, but we need to centralize the dependencies.

Change-Id: Ic8316b3415141ea89b50dabe26bdc079bf52b4c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:17:02 +02:00
Oswald Buddenhagen
37a64fb867 factor out all library dependencies to _dependencies.pri files
this makes it uniform for all libraries

Change-Id: I7a7665a2c74c8f212248c0400de04ca3eed1440a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:16:42 +02:00
Petar Perisin
31ed90b47b Git: Show remote branch in topic
No extra terminal commands are executed.

Change-Id: Ia875b5dbce2784962b9fc2b7c9c1b0a696a02ec8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-04-02 12:03:45 +02:00
Kai Koehne
7e1a94e59a Remove unneeded typedefs
Fix gcc 4.8.0 warnings like

warning: typedef 'AvahiSimplePollSetFuncPtr' locally defined but not
used [-Wunused-local-typedefs]

Change-Id: I5cc2917958dc8e6a4c31031577ecc66575b8d328
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 11:54:32 +02:00
Petar Perisin
eebee3311d VCS Clean Dialog: Added "Select All" checkbox
Change-Id: I5bff60b1aa1985926efb6b850be958f48d67a029
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-04-02 11:37:02 +02:00
Marco Bubke
3937aabdea QmlDesigner: Fix compile warning
Change-Id: I32665d8a9aadb7c3dec7f839477abe084ec66287
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit b3c82d3afb)
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-02 10:14:54 +02:00
David Schulz
0bac4d861d cdbext: Fix dump of QString from QPrivate class
Change-Id: Id7f1242405acebd8db37369ad3c4fa2442cb80a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-02 09:40:34 +02:00
Daniel Teske
e9dceef1bb Android: Remove empty button on android device page
Task-number: QTCREATORBUG-9017
Change-Id: Iba8900dd3d5a5ab380c361abd435b08857eb1fd2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 09:33:43 +02:00
Petar Perisin
b0226e6e96 Open project if it was not added to VC system.
Currently project will be created, but if it fails to add it to VC
system, it asks user to open project anyway.

Task-number: QTCREATORBUG-8892
Change-Id: I8d6cfad4a5d6b4810491d355f916dfe031e82a52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 09:21:02 +02:00
Robert Loehning
003821f936 Squish: Prepare tst_CCOM01 for Qt5
Change-Id: Ic2806673cb65018000bcbe6ae66dad1b2f555e39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-28 18:57:43 +01:00
Christian Stenger
7f0ff88c61 Squish: Speed up removal of registered documentation
Change-Id: I0a639ee608b0430a98840406ab14e224d1a64d49
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-28 17:24:29 +01:00
Eike Ziller
a2df8cb0b7 Make adding variable support to textcontrol easier.
Add convenience method in variable chooser and move magic constant to
the place where it's used.

Change-Id: Ie93acb98e13efcacb77d1a478df927a11b16926b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 17:00:34 +01:00
Christian Kandeler
02842c146c RemoteLinux/Madde: Do not do too much checking in run control factories.
Only check whether we are generally responsible for the given type of
run configuration. Delay the other checks to a point where we can give a
meaningful error message to the user.

Task-number: QTCREATORBUG-6330
Change-Id: I9c8419da7780ebe17ff853bcae3de14b9cb66b71
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-28 16:03:08 +01:00
Christian Stenger
a4dda7bc8d Squish: Raise snooze() time when using Mac filedialog
Change-Id: I92b6a6a449e2df6a2ce92c277d9a1fa326b36606
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-28 15:09:50 +01:00
Friedemann Kleint
c0b6d1d3f2 Clean headers in Qt4ProjectManager.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 13:38:30 +01:00
Tobias Hunger
79e48237d6 RunConfigurationAspect: Simplify cloneing
Change-Id: I21366f932e372c1c0fa8c9d29184e71d1c0cf4a4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 12:44:06 +01:00
Friedemann Kleint
2c9d93a328 Qt4ProjectManager: Forward-declare some classes.
Change-Id: Ia05cbfec090bf42d8b9c0475e8904dbad12486d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 12:41:44 +01:00
Thomas Hartmann
7aec3cbdd0 QmlDesigner: fixing memory leak
The destructor has to be virtual of course.

Change-Id: I8553946e81a7344caf1a963a4b41c6ee73f39283
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-28 12:34:23 +01:00
Eike Ziller
d3c979dc0f Merge remote-tracking branch 'origin/2.7' 2013-03-28 12:19:45 +01:00
Tobias Nätterlund
5c36c594fe QNX: Refactored connection handling for BlackBerry devices
The blackberry-connect connection is now established at
Qt Creator startup, and taken down when Qt Creator shuts down.
The user also has the ability to disconnect manually in the
Device settings widget.

The connection status is shown in the Devices settings widget,
as well as in the project selector. And it is impossible run or
debug an application without having the device connected.

Change-Id: I64f2e48a647e6d850851d2f20d0ec7bbd5980ea5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
2013-03-28 12:00:51 +01:00
Robert Loehning
bcbd1eeb4c Fix minimum Qt version for Qt Quick 1 Extension Plugin
Task-Number: QTCREATORBUG-9018

Change-Id: I95f08034ec151bca98ce7050b749890226103e6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-03-28 10:29:17 +01:00
Oswald Buddenhagen
44200e0fee do not unnecessarily use qtcreatorlibrary.pri
these are not really qt creator libraries

Change-Id: Iadf9c0cde282776e26ab9210b480aa372f87301d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-28 09:47:32 +01:00
Oswald Buddenhagen
9f3adb8df9 add missing license header
Change-Id: Id8676d88ec8f55d0ba1650420fd2e48e6087b18e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-28 09:46:32 +01:00
Christian Stenger
7c4478c4b9 Squish: Add Mac workaround to tst_revert_changes
If the editor had not been clicked before invoking the
Edit menu Creator does not notice that the editor has focus,
so all subitems will be grayed out.

Change-Id: If8b23fd6abae1bac6b3387e9a5394cfb4b84529d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-28 09:22:51 +01:00
Christian Stenger
adafc02192 Squish: Fix detection of ABIs on Mac
Change-Id: If3cca65f1f3ccf7e62dc79cde72d1bce41ab92b9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-28 09:22:43 +01:00
Orgad Shaneh
d59651cb39 Tests: Export plugins in PluginManager
Without this, lib file is not created using MSVC, and
the build of dependents fails

Change-Id: I37ca02d8e1c6b99fdf901679ccee932f1ed55450
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-28 09:02:43 +01:00
Petar Perisin
6a4ecce83c GenericProject: add only existing files
when refreshing project check if files exist, and add only existing
files to the project

Change-Id: I5937bbe39e56c089b97350e095458c014fd294fb
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
2013-03-27 18:40:18 +01:00
Tobias Hunger
371ad5630a DebuggerKitInformation: Handle null QVariants
Change-Id: Iac2b3fde2d7357d8c00db05ed4ad39e6b5a861e9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 17:13:06 +01:00
Robert Loehning
d41e01696a Squish: Added Qt 5.0.1 Kit
Change-Id: Ia5c81254de3bd2ad3537ac3a300aa2dbe0e16015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-27 17:11:41 +01:00
Oswald Buddenhagen
c5228e64ea move QT+=network to projectexplorer_dependencies.pri
it's used in both the plugin itself and in the plugin's .pri

Change-Id: Ifeea9660270638dd2eb3d42d9784364e7c60b233
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:22:41 +01:00
Oswald Buddenhagen
26a141f4ec remove INCLUDEPATH *= $$PWD from plugin .pri files
the include statements are supposed to be written in a way that makes
this unnecessary.

Change-Id: Idf0860b4c594d88477bca4528c5e9d2a172530b4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 16:22:26 +01:00
Oswald Buddenhagen
4fa66c8a33 factor out all plugin dependencies to _dependencies.pri files
this makes it uniform for all plugins

Change-Id: I46ede2cb576059dfbaa74c2448517a102eb44ddf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:21:16 +01:00
Oswald Buddenhagen
671587ebb4 move cpptools => locator dependency to cpptools_dependencies.pri
it belongs there.

Change-Id: I2d05287b90476ba1fde5ddda282f5a2b1766f6a2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:20:53 +01:00
Oswald Buddenhagen
70efd3906d remove redundant library dependencies
the respective _dependencies.pri files already list them.

Change-Id: I2008abdd043bf3c8738035971b0cbbfe57b02ba2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:20:35 +01:00
Orgad Shaneh
aa3dcd92b7 Tests: Fix compilation with Qt 5.0.1
Change-Id: I6e9d5fd34bec8cbecaa4868b5e07cc11d490d6d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:17:16 +01:00
Orgad Shaneh
6dc975a8ad Tests: Fix MSVC errors and warnings
Change-Id: I7350b3fe751a76787a932e1346ad19377a6ea9bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:14:24 +01:00
Orgad Shaneh
1db74e381c Tests: Add missing include for MSVC
Change-Id: I95196a8d57a8bf8f09a52aa54fa1c8bbfe752168
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:10:01 +01:00
Friedemann Kleint
e4ae884ee0 Fix Krazy warnings about improper include guard in various plugins.
Change-Id: I8b793ede842181e50d2bc3125ecfd3ed0b70e9d6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 15:43:04 +01:00
Orgad Shaneh
8ae9d61b3c Enable WITH_TESTS when BUILD_TESTS is specified
Change-Id: Ie871ea099caa08b2757303e81733acc5ed6294de
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 15:38:19 +01:00
Orgad Shaneh
03e7037aaa Android: Fix compiler warning
Comparison of bool and int

Change-Id: Iec471ce393442c4d75dffce4b3ddc9d275c17e67
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-27 15:33:28 +01:00
Friedemann Kleint
075a069d1c Clean headers in QtSupport.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Iac7e32b861d60c4c386f64f065d05a1856e396cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-27 14:33:40 +01:00
Christian Stenger
f706d18374 Squish: Fix problem with Mac menubar
Change-Id: Id03f060acb1ba343cfd1ff9199f3f1de46abd58b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-27 14:29:29 +01:00
Orgad Shaneh
1d19c1e6a0 Remove wrong QTC_OVERRIDE
Change-Id: If52aa452a7607cdebfb4082feecf181eb0ae4fa2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-27 14:24:30 +01:00