summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* QmlJSInspectorAdapter: remove onObjectTreeUpdated()Aurindam Jana2012-05-242-12/+0
| | | | | Change-Id: I716ea2417cea5096abc7d740899c6988fe5dcbd8 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Show shortcuts in debugger tool buttons.Eike Ziller2012-05-241-25/+28
| | | | | Change-Id: I3135bebe006305676486cfc7472eb3cec129108d Reviewed-by: hjk <qthjk@ovi.com>
* Svn: fix lack of completion in submit editorHugues Delorme2012-05-241-1/+3
| | | | | | | | Completion in the "Description" field of the commit editor was broken with the Subversion plugin. Change-Id: I82045b96b5f987dce849265abb169cdfbbed45be Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Debugger: Warning message corrected.Simjees Abraham2012-05-241-1/+1
| | | | | | | | Corrected the warning message shown when changes are made for JavaScript when "Apply on Save" is active. Change-Id: I5ed839ee0bc3926b93a02c66ea50868062e7cadf Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Fix for Apply on Save.Simjees Abraham2012-05-242-1/+18
| | | | | | | | The difference check/comparison to saved document by preview is done only if the file was changed in the editor. Change-Id: I086fa5f5948a15a449d25ea85921551766f7b62a Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Mac: Avoid more Opt+<char> shortcuts.Eike Ziller2012-05-237-9/+13
| | | | | | Change-Id: I1f2ae70ed8b184be6d1467642924289af1b535a9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Filter virtual folders out again for simplified project tree.Eike Ziller2012-05-231-1/+1
| | | | | | | Broke with e8ee898864dee2b7e7fef7656ea030ab9d85332b Change-Id: I0e4cc8506580a2cf1884c96c3e7baffd5614d2b1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* compile fix on non-machjk2012-05-231-2/+0
| | | | | Change-Id: I5072f7185ebac9359202ed39463323eddcbc9ceb Reviewed-by: hjk <qthjk@ovi.com>
* Get rid of lots of ifdef Q_OS_MAC for shortcuts.Eike Ziller2012-05-2322-357/+116
| | | | | | | Using a central enum now. Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06 Reviewed-by: hjk <qthjk@ovi.com>
* Debugger: Fix compilation on Windows.Friedemann Kleint2012-05-232-1/+8
| | | | | | | Broken by f77cd29e54f832cbb72533842acb4dda655540f1. Change-Id: I3cbb4e90ffae45ca1475b0de1a00cb5ee58f966a Reviewed-by: hjk <qthjk@ovi.com>
* WelcomePage: adjusting minimum sizethohartm2012-05-231-1/+1
| | | | | | | Task-number: QTCREATORBUG-6818 Change-Id: I030c38e0cc5e370a8f18f5cefc805a51ec730c9a Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Fix a warning about integer change of sign with ICCThiago Macieira2012-05-231-1/+1
| | | | | | | | | showSyncWarning would print the line and column using QString::number, so instead of a -1 (which was probably the author's intent), it would show 4294967295. A zero is probably better. Change-Id: Iff663be1a98d4d934755447e34a5dc8f9149047f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Silence warning about unnecessary use of the containing namespaceThiago Macieira2012-05-233-5/+5
| | | | | | | | | | | | | ICC complained: src/plugins/qmldesigner/designercore/include/propertycontainer.h(52): warning #1098: the qualifier on this friend declaration is ignored friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator<<(QDataStream &stream, const PropertyContainer &propertyContainer); ^ The solution is to simply remove the namespace qualifier when the class is already inside that namespace. Change-Id: I2256ebe072b3f8db5288f72acb1388eabcb8325c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Mac: Allow searching for e.g. Cmd+E in shortcut settings.Eike Ziller2012-05-231-2/+16
| | | | | | | | | The tree view shows the fancy special characters for the modifier keys, so it's not possible to filter for them. Change-Id: I3f0cab24afe8ccb9a95300e91eb1bc45a0e4313a Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rewrite the shortcut settings filtering.Eike Ziller2012-05-232-27/+17
| | | | | | | | | Makes more sense now, is more generic (regarding nesting level), and even is shorter. Change-Id: I77ce34aa25655f6b2690964107f4cab018e1d66f Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix broken handling of unsupported mime types.kh12012-05-231-7/+121
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-2701 Task-number: QTCREATORBUG-4059 Enable plugins to support pdf, etc. files out of the box in Qt Creator. If we still fail we try to open the link using the desktop service, as last resort to open a page showing some error message and hints about the error. Adjust the old page not found message to match the new design. Change-Id: I7fef79d27e8bc279a6169b6f3da4787ffa0d023d Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* IOptionsPage: replace virtual fuctions by data membershjk2012-05-23101-1545/+406
| | | | | Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix the rest of the warnings about integer sign change with ICCThiago Macieira2012-05-226-9/+9
| | | | | | | | | | None of these change the code in any way. The solutions applied are: - change the type to a more appropriate one, if possible - use ~0 instead of -1 when flags were intended - cast a -1 to the proper type otherwise Change-Id: Ifcc125528f32b8c8f9ab20bea103e2a693045bf8 Reviewed-by: hjk <qthjk@ovi.com>
* Fix non-void function that returned without a return valueThiago Macieira2012-05-221-1/+2
| | | | | | | | | | QTC_ASSERT(false, action) would print "false" and then take that action (the return). The other branch of the QTC_ASSERT was a constant false, so it would never be taken. However, ICC didn't seem happy with it, so I moved the return to after the checking. Change-Id: Ia50e75c91fb345e6b21cd5f91df3070544b42d22 Reviewed-by: hjk <qthjk@ovi.com>
* WelcomePage: add delay to filterthohartm2012-05-222-3/+26
| | | | | | | Setting the filter is now delayed to allow proper typing. Change-Id: I9faa2b9810766b2a51bf02d4a14222a9f0a81693 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* WelcomePage: fix search filterthohartm2012-05-222-1/+12
| | | | | | | | We reduce load on the view by using beginResetModel() and endResetModel() while filtering. Change-Id: Id3caacc78cdba1c81d915dc1cbb40ada5bfda522 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Mac: Avoid Alt+<character> shortcutsEike Ziller2012-05-228-2/+126
| | | | | | | | Because these tend to add special characters into the editor instead of triggering the shortcut. Use Ctrl (aka Qt's Meta) instead. Change-Id: I5866772baf4550e6d048e4d7252b2899a6d28296 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix "New" dialog in dark themes.Eike Ziller2012-05-222-2/+5
| | | | | | | | | Don't explicitly use white, use the "base" color. Task-number: QTCREATORBUG-7435 Change-Id: I3fcfefd958857146b6f9b2ceef3376d2b582b807 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Mark canceled searches as such.Eike Ziller2012-05-228-14/+33
| | | | | | | | Task-number: QTCREATORBUG-6820 Change-Id: Ic14c0ea6f26e4a05c642012b87578f30c817fef7 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* outputpanemanager: reworkhjk2012-05-224-181/+298
| | | | | | | Replace "title combobox" and add a "manage" button. Change-Id: I5453197b207000e6987b7dffd1858facb4b7f32e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* debugger: remove unused codehjk2012-05-222-16/+0
| | | | | Change-Id: I22e8eb7cc5b632f42aedf71085a1f446bb5fcc68 Reviewed-by: hjk <qthjk@ovi.com>
* Fix qbs build for help plugin.Christian Kandeler2012-05-221-1/+1
| | | | | Change-Id: Ie71eda809f98b76d32a92b86e6351996451ff4b5 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Use correct row height in search results pane.Eike Ziller2012-05-222-4/+10
| | | | | | | | We were always using the editor font height, even for searches like C++ Symbols which don't use the editor font in the search result items. Change-Id: I2e937d5e934990aceb43898e4ee82dfbd0364d42 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix qbs build for qmlprofiler.Christian Kandeler2012-05-221-0/+2
| | | | | Change-Id: I73347b5a7cc3866c7d7df9dec5c835fda8006938 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Move SSH support into a dedicated library.Christian Kandeler2012-05-2267-243/+245
| | | | | | | | | It does not belong into libUtils, which is a collection of small unrelated utility classes. Task-number: QTCREATORBUG-7218 Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlJSInspector: New Objects createdAurindam Jana2012-05-222-6/+6
| | | | | | | Send the engineid, objectid and parentid. Change-Id: I7b340c1f20ba3eb3f1690d45b28819f6efaae013 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Response for DESTROY_OBJECT message is used.Simjees Abraham2012-05-212-0/+7
| | | | | | | | Response for DESTROY_OBJECT message is used to refresh the object tree such that the destroyed object is not shown in the tree view. Change-Id: I32d72fa75bbdca6c63551e71395816597dcc0b75 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlProfiler: state dialog as floating widgetChristiaan Janssen2012-05-2111-148/+313
| | | | | | Change-Id: I48ff1d729e49347881c82c7bd066d30ecaca47a5 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* manhattanstyle: don't use defines for constantshjk2012-05-211-3/+3
| | | | | Change-Id: I19a9b86c37dfcd1be7451d6fe67322a833d7b322 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* explicitly enable exceptions where they are requiredKonstantin Ritt2012-05-215-0/+9
| | | | | | | | | | | commit 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c in qtbase desabled the exceptions support by default for most modules. Make sure we explicitly enable them for plugins and libraries that uses exceptions internally. Change-Id: Id3dc9d572ac7ccd35a869046cfc5d6c4ffec3ba2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix closing document when split and two documents are open.Eike Ziller2012-05-211-2/+9
| | | | | | | | | | If one had two documents open, but the same document visible in both split views, closing the document would lead to an empty view and strange behavior of the close button while in that state. Task-number: QTCREATORBUG-7361 Change-Id: I3c0673a82b9d11700326a946a04984a2d6d58fe8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Fix small typos in argument names.Dmitry Savchenko2012-05-212-2/+2
| | | | | Change-Id: If90f441df6147253903e2c1765d8a6c10eb3b187 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Debugger: Enable 'Select Widget ...' only if one can add expression evaluatorsKai Koehne2012-05-181-2/+2
| | | | | | Change-Id: Ie515e3d318137206f4f60021d7f154c370b83932 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Debugger: Fix order of setting debug-file-directoryDavid Schulz2012-05-181-11/+7
| | | | | Change-Id: Ie4032edd4eebc1e3a79fbe15c0bc1292b4a3292a Reviewed-by: hjk <qthjk@ovi.com>
* DebuggingHelper: Move to QtSupportTobias Hunger2012-05-1847-143/+159
| | | | | | | | | * Move debugginghelper to QtSupport. ProjectExplorer should not start looking for Qt versions! * Make autotools and generic project plugins depend on QtSupport Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Qt4PM: Support "Build File" for debug_and_release configurationsOrgad Shaneh2012-05-184-29/+37
| | | | | | | Task-number: QTCREATORBUG-106 Change-Id: I9aef17f8b57051ee4b7d22cc4e454d453ea4c821 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Gerrit: Make number a URL.Friedemann Kleint2012-05-181-1/+1
| | | | | | Change-Id: I15e07746290241ae10f0c9ecaaad1be5d86ed76c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt4PM: Add Build File context menu entryOrgad Shaneh2012-05-183-0/+12
| | | | | | | Task-number: QTCREATORBUG-106 Change-Id: I50e2068648e6d58405de63ef5f1b575e69b676da Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Qt4PM: Enable Build File manuallyOrgad Shaneh2012-05-181-2/+3
| | | | | | | | Build File should be enabled iff current file is a source file and current project is not building Change-Id: I8b5a083b79d00cbe49ff3e5df29f07fd4db94f71 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Qt4PM: Re-enable context "Run qmake" for root project nodeOrgad Shaneh2012-05-181-4/+5
| | | | | Change-Id: I4e4abf8dfc7997d3fdf4525fc97ff277f112b7d9 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Gerrit: Fix compilation with MSVC2010, Qt 5.Friedemann Kleint2012-05-181-7/+7
| | | | | Change-Id: I8fe5047d99bcac8e81053f750d5ce038773a0ca2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Device support: Show availability in settings widget.Christian Kandeler2012-05-182-0/+23
| | | | | Change-Id: If82b23ac71d8c94c6ff659cba10f2858234ddca6 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Gerrit: Make dialog narrowerOrgad Shaneh2012-05-181-3/+7
| | | | | | Change-Id: I2c298cde61b7643578c1c2665f8aee994a7289cd Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix qbs buildOrgad Shaneh2012-05-181-5/+3
| | | | | Change-Id: I0c2f11b5ad064d1c8e51000f6295ae23608d32bb Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* RemoteLinux: Don't assume the ln command understands "-v".Christian Kandeler2012-05-161-1/+1
| | | | | | | Some busyboxes don't have it. Change-Id: I235673169a443665743c078c93622464cc2d005d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>