Commit Graph

23693 Commits

Author SHA1 Message Date
Kai Koehne
36dfdf2ef9 QmlJSInspector: Clean up dependencies
Change-Id: Ic7a721a085b9849195a91d49daf3d685e499e121
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-12 17:04:19 +02:00
Kai Koehne
e19ab22081 Debugger: Show tooltips for message log window
Change-Id: I18d476714f8adcdc4adf293edcb9f3212c7eaab0
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-12 17:04:11 +02:00
Christian Kandeler
a37cf48a1c Device Support: Merge id and fingerprint.
It seems pointless to have two identity-related concepts in parallel.
The new approach is as follows: The identifier is a Core::Id. If the
client code supplies a fingerprint string (as needed for auto-detected
devices), the id is derived from it, otherwise it gets created from a
newly generated UUID.

Change-Id: I680afa6cd2fdd43ec1c461616ba982b3ff55c73a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-12 16:36:24 +02:00
Marco Bubke
89937deba0 Change the toolbar of the debugger sub windows to a flat grey tone
Change-Id: I3f3270fc88b4b3a98d34b70efed4aabc27fe8fcd
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-12 15:52:34 +02:00
Fawzi Mohamed
c45d49b027 zeroconf: add version to avahi lib
Change-Id: Iedb59b74b1f9950abb0ca1d5adaaa594a465c0fd
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-12 15:36:10 +02:00
Tobias Hunger
1f4caf5399 Device: Add create method to IDeviceFactory
Add a create method to the IDeviceFactory and make it replace the
createWizard method. The create method may or may not pop up a wizard.

Remove IDeviceWizard as suggested by Christian.

This patch also adds a canCreate() method to check whether a factory should
be asked to create something or not.

Change-Id: Iaf16aa407530022e8f3804093b58dc3f120f7599
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-12 15:35:23 +02:00
Konstantin Tokarev
866cc42154 Added menu item for (re)building and cleaning of current subproject.
Change-Id: If1990cd6c4a8a6179ff93f535b5c9a7c116d69ec
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-12 14:28:22 +02:00
Marco Bubke
225938aab7 Fix version control and qml component refactoring
The file should be added to the repository after its creation.

Task-number: QTCREATORBUG-7246
Change-Id: I3ac055c4e7391a9117e13494f52db5df60b63411
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-12 14:10:30 +02:00
Marco Bubke
00c6c1fdb6 Class name validation line edit can now force for capital letters
Qml components should be upper case. Makes the regular expression static.

Change-Id: I46650df9b9ae10ceaf3bfb7f888db075f572735b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-12 14:09:33 +02:00
Marco Bubke
9fcae41672 Improve validation of the move component refactoring dialog
Using PathChooser and ClassNameValidatingLineEdit improves the usability.

Change-Id: Ib01ee99222ea495b37b0e839fbc68981b071d0a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-12 13:49:03 +02:00
Marco Bubke
1cb6619073 Give Move Component dialog a proper name
Change-Id: I8034f3fbe5d4d10b1fbfb99a97ab3f0402faf082
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-12 13:48:26 +02:00
Fawzi Mohamed
4955c33b66 zeroconf: interface->networkInterface, to make VC++ happy
Change-Id: Ie5f5d11dc31dca78e6ba0b7d6e17a8feae816090
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-12 11:00:37 +02:00
Aurindam Jana
85bd550714 TreeViewFind: Remove warnings
Change-Id: I6b67ccd40f8e9acd7b30d5caac64f06553da6d61
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-12 08:53:26 +02:00
Tommi Asp
c49b7a3edf Fix QML plugin dumping for QML projects
Change-Id: I2e5f4b645c262d8bc4f890a5fab943fbf2dd7cb4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-11 19:24:07 +02:00
Fawzi Mohamed
5a0e88f9b2 zeroconf: autorefresh timer repetitive -> recursive
Wait 5s+ time to start the query instead ot 5s seconds in total
(should be better on slow machines, as the waiting time is not shortened).

Change-Id: I11104b314c4388a0f8ab84fca662f2e57e6e9b6a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-11 15:42:44 +02:00
Fawzi Mohamed
cc378a4c32 zeroconf: add QNetworkInterface interface to Service
Change-Id: Ia357f21086cf0df7144b0602acc392d3f8a22348
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-11 15:40:50 +02:00
Aurindam Jana
689e5a09f3 CrumblePath: Sort Children
Add a sort children function

Change-Id: I3621abf11fdea22deda6aba1ef6e094554950c93
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-11 15:37:15 +02:00
Thiago Macieira
8a5074734a Fix the compilation with GCC 4.6's headers.
std::list is in #include <list>

/home/thiago/src/qt/creator/src/libs/cplusplus/pp-engine.cpp(110): error: qualified name is not allowed
      std::list<PPToken> tokens;
      ^

Change-Id: I02a08afe6a678d66d528ce5dfca08317735704e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-04-11 13:32:44 +02:00
Aurindam Jana
d219cd2660 QmlJSInspector: Property Inspector
Call "SET BINDING" instead of "EVALUATE" when setting
values in the property inspector. This solves problems
related to setting of some property types such as URLs.

Change-Id: I256aef7db52b2e029d2b8ad6d17723eb1c46006f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-11 13:06:09 +02:00
Kai Koehne
56e17e53c2 QmlCppEngine: Fix cpp bp insertion when debugging QML
The cpp slave will be interrupted when inserting breakpoints.
Track in this case the cpp engine state until it's running again.

Task-number: QTCREATORBUG-7230
Change-Id: I4cf275916d8f0581916d95f2f440ea12358aeeeb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-11 10:20:36 +02:00
Kai Koehne
a751e447bc CMake: Fix warning about unused variable
ICore::actionManager() is a static function.

Change-Id: Ic687dd1e41923e962f8eaf12b513dc188655d9c6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-11 09:51:17 +02:00
Kai Koehne
f0742b620c Debugger: Fix warning about unused variable
Core::mainWindow() is now a static function.

Change-Id: I8da4b72fc47f30fc20a3a2db725d13760a095814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-11 09:51:07 +02:00
Aurindam Jana
5269ff1a0e QmlDebugging: Log service version
Log the service version along with the service name and state.

Change-Id: Ib2e7829d89651998dccffbaa0432908158b9dafd
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-11 09:25:28 +02:00
Friedemann Kleint
eb802c2b38 Fix QML debugging in QMakeStep.
- Use 'qml_debug' or 'declarative_debug' depending on Qt major
  version.

Change-Id: I10d1973b34994675b07b1d06d5e81b584d132fb4
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-11 08:40:15 +02:00
Christian Kandeler
688b7a1a30 Remove outdated information from README file.
The NetSieben library hasn't been part of QtCreator since 2.1.

Change-Id: Ibc8979215a39626728f3c28e7ccf479e59c4fb5d
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-10 23:26:38 +02:00
Joerg Bornemann
d6465142eb qbs files: build with Qt5
Help plugin and QmlDesigner have been disabled for Qt5.

Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:03:37 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Kai Koehne
b8d69b37fc QmlCppEngine: Call quitDebugger already in InferiorShutdownRequested
Doing it in (CppEngine) EngineShutdownOk will result in a write to
an already closed socket.

Change-Id: Ie9712f33d57348ecb27e31eaeb44f42f159a400c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-10 17:10:11 +02:00
Tobias Hunger
d0f8fdb29d DeviceManager: Allow for replacements of devices
When adding a device with an existing internalId, the devicemanager
will now replace the device with that id, calling remove on the old
one and adding the new one afterwards.

The DeviceManager also emits a deviceUpdated signal with the id of
the device that was changed.

Change-Id: I88c789de355f3e059dbf909c20f58548a2fd46fc
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-10 16:35:44 +02:00
Yuchen Deng
ffa46fd251 ExamplesWelcomePage: Fix wordwrap of description text
Change-Id: Ibce8a4cc32f5bcaa30f9a5b5376f7e64f367455a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-10 16:04:13 +02:00
Christian Stenger
146b1672d2 Squish: Handle None in __cropAndLog__()
Change-Id: Ie2bbcfde7684f0d25ed8ff7e7da2897a9f1a0873
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-10 14:58:18 +02:00
Aurindam Jana
c74458765d QmlJSInspector: Query Root Objects
As parentIds are now known, query only root objects initially and
build the object tree lazily.

Change-Id: Ic6895ad8a0dd8dc2a2b1d8aa71fdf6766974eea5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-10 14:37:16 +02:00
Aurindam Jana
a7c1f55eba QmlV8DebuggerClient: Skip internal frames
Change-Id: Id7555807a0fc4d796035c922c04d5d7ced512d81
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-10 14:37:07 +02:00
Aurindam Jana
cd460198d9 QmlJSInspector: Select only current selected item
Change-Id: Ibb52e8f1c065d37accc022740ef50b2817d52771
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-10 14:36:57 +02:00
Aurindam Jana
d68900343f QmlJSInspector: Query object only when connected
Change-Id: I6298644badd633198b7588942809d45ef15e18c1
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-10 14:36:45 +02:00
Aurindam Jana
e32f2d7ffd QmlJSInspector: Disable Zoom Tool for QmlDebugger
Zoom Tool and Select Tool are combined for QmlDebugger.
The Zoom Tool is enabled only for backwards compatibility.

Change-Id: Id66eb94ce0535ccac169fa5a80f937370a0f9f6f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-10 14:36:36 +02:00
Aurindam Jana
1074f9a5e1 QmlJSInspector: Query objects until root is parent
Change-Id: I239f028cbf450703cefd9dde584067ec1ce8032c
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-10 14:36:28 +02:00
Thomas Hartmann
f864df8fd2 Wizards: usablitity fix
If the virtual projectKind item has no children it is deleted.

Change-Id: I5f86b18043ed937b3f38c8e1591a529af934043a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-10 14:18:32 +02:00
Christian Stenger
88eec5ae47 Squish: Use sorted filenames also for Console
Change-Id: I8ac973e772b3d1856e5307319c75fb4d150cf818
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-10 13:54:43 +02:00
Aurindam Jana
3d32f42b7d Debugging: Pass a DebuggingLanguage arg in executeDebuggerCommand()
Change-Id: I99eedc86c987615072b7400051b61700b98ebab3
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-10 13:12:10 +02:00
Christian Kandeler
e2d8a9600e Device Support: Move some functions from IDeviceFactory to IDevice.
Now that we have a polymorphic device class, we don't need to
attach all the virtual functions to the factory anymore.
In addition, the isUserEditable() function is gone, because it is
no longer needed in the presence of device-specific widgets.

Change-Id: Ie8f0be95653cb83e1618885b08cdd2aacf5dda59
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-10 10:55:50 +02:00
Fawzi Mohamed
8bdbbab157 zeroconf: avoid updates immediately after a refresh
Change-Id: Icb1afb741fb288208666c6cc54f88a7848532305
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-10 10:47:37 +02:00
Christian Kandeler
eda1e12268 Device Support: Fix keyword search in settings widget.
- Add auto-detection label text.
- Fix editing artifact that led to the ampersand character not being
removed from the search string.

Change-Id: I4221083e5a8d8ebfd66d9806cf96f9f6d9714d32
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-07 13:10:41 +02:00
Christian Kandeler
014ceb58b0 Madde: Introduce new class MaddeDevice.
This is needed for an upcoming change that will move a number of virtual
functions from IDeviceFactory to IDevice.

Change-Id: I3658c057583853359b3f0e901f5db78502e1a993
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-05 23:14:52 +02:00
Aurindam Jana
88e6448ff8 CppDebugging: Interrupt Inferior
When debugging in asynchronous mode, the interrupt command
needs to sent immediately for the queued commands to be
processed.

Change-Id: I4f45f837ab843786992f54421599d897f9235abe
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-05 20:33:10 +02:00
Eike Ziller
9ec6e9f7e0 Merge remote-tracking branch 'origin/2.5' 2012-04-05 18:24:26 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-04-05 17:22:06 +02:00
Eike Ziller
2aa4b803a6 Work around uiLanguages crash on Windows with 4.8.0
Task-number: QTCREATORBUG-721
Change-Id: I159c4ef85eba1eda9f3b7e3a001dd6991d578ffe
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-05 16:59:26 +02:00
Daniel Teske
10438d2e9d BaseTextMark: Support renaming files
Change-Id: I8d712f76fca5d8f5ecad70f1485228e21c00648d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-05 16:47:15 +02:00
Fawzi Mohamed
e6565936e0 zeroconf: fix race condition in triggerRefresh
Change-Id: I771647613bec198884f591af4fa48a16d94ecab4
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
2012-04-05 16:30:07 +02:00