Commit Graph

20593 Commits

Author SHA1 Message Date
Thiago Macieira
e58f203e4c Silence a warning about unrecognised pragma with ICC
src/libs/cplusplus/MatchingText.cpp(64): warning #161: unrecognized #pragma
  #    pragma GCC diagnostic ignored "-Wstrict-overflow"
              ^

This pragma is recognised in GCC only, so don't enable it for when ICC
fakes to be GCC.

Change-Id: I3d9830dc2b12632dd08d8c8961219bd253ad8c1d
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-28 00:28:30 +02:00
Friedemann Kleint
753acdcf82 tr()-Fixes in master.
- Add missing Q_OBJECTS
- Clean up Android, fix capitalization, remove redundant
  translations.

Change-Id: I24583b7e363ff8f90cad3b8257b676888e8a59db
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-28 00:23:29 +02:00
Aurindam Jana
a79e38ac6f QmlJSInspector: Set property values
QML property values could be set in the inspector.
Regression introduced by 7f09d0b756.
This patch is a partial fix. Only values can be assigned currently.
For expressions, use the console.

Change-Id: I945b11109cd7788dd0f5277af206bf9658844aee
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 11:20:49 +02:00
Aurindam Jana
023deff474 QmlJSInspectorAgent: Refactor code
Try to use the watchHandler for referring to the object tree
instead of caching the object tree locally.

Change-Id: I68624771ef49d50f2cf0d6d580b1b34d57483178
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-25 11:20:36 +02:00
hjk
6ef2c09247 debugger: remove workaround for some gdb 6.4 builds
Change-Id: Id13f9b352810f59301c409c73f510542687343e7
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 11:14:25 +02:00
Orgad Shaneh
f88d995f9e Gerrit: Onlt set port flag if SSH parameter chaned
Change-Id: Ib006e31fdb5d832f67a19fa115a80c871628ccc6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 10:51:04 +02:00
Theo J.A. de Vries
1efd121b39 added possibility to enter port specifier to gitorious address
Change-Id: I4558b5151dfe1abde98037173c0a83b6a070c6b5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 10:40:56 +02:00
Aurindam Jana
637ae98c6f BaseEngineDebugClient: Unpack property of type Variant
Task-number: QTCREATORBUG-7456

Change-Id: I6db02007ce4e89f7203530167ca307dc29bd4fe1
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-25 10:30:08 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
Friedemann Kleint
7c7ccdc764 Gerrit: Do not run plink executable in accessor of OptionsWidget.
Do not run the process every time the user presses 'Ok' or 'Apply'
in the settings page, do it only if the gerrit parameters actually
changed. Also check for empty binary.

Change-Id: I934616e5d9b20404278f1fd9fc751ff161030cd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 09:51:29 +02:00
hjk
557c73adfb debugger: prevent watched expressions from re-appearing
Task-number: QTCREATORBUG-7408
Change-Id: I2936aff74b629b6d58cbcd09e023346dabdf191f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 08:26:57 +02:00
kh1
ba185b8336 Make sure we call stop before removing a page.
Fixes a spinning cursor in case the page was not fully
loaded and we where closing it at the same time.

Change-Id: Iae6efac70c0c8be2f84e6b1551275bbdf9c5aab3
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-24 21:43:36 +02:00
Dmitry Savchenko
9fe784115a Allow not only a colon as a keyword-text divider in todos.
This makes possible to scan such things as doxygen \todo, @todo
entries where colons cannot be added after a keyword.

Change-Id: I13c757294c94a1f4758e7dc9634a79ea6e91c68f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-24 20:38:23 +02:00
kh1
b6b2441e55 Return a valid URL from a user supplied input.
Change-Id: If69577caa4a5a7ea024f80c8ac995807d6d14fbd
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-24 20:26:39 +02:00
kh1
a225799d25 Remove some unused code from central widget.
Change-Id: I07ee65ac438c20bb46803cdcc081e53b44834f4e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-24 20:24:55 +02:00
Orgad Shaneh
5f03e0260b qbs files: Add process stubs
Task-number: QTCREATORBUG-7233

Change-Id: I5255a41f0a6198e4c8c7e6022c97618937ef1790
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-24 17:05:20 +02:00
Orgad Shaneh
b7927fe1b0 Gerrit: Support plink
Change-Id: I7fe7c5d47b17b2e5d8179e7deb9cb8e566f15912
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-24 16:39:27 +02:00
hjk
cc6a3b4fd7 debugger: fix regression when trying to remove watched expressions
Change-Id: I0d12339ab1903dc78eec699e07fc0c17daab0e5d
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-24 16:25:49 +02:00
hjk
e11a3a7697 debugger: rework WatchModel
It's one model for all locals, watch, return, tooltip and inspector
data. This allows more streamlined code paths and better isolation
of the model data from the WatchHandler. WatchItems are now registered
in a hash indexed by iname, so inames can be used as the primary
handle to watch data in the WatchHandler interface.

Change-Id: Idac0a808b5d785307496d1de4198a1f2e9ce3880
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-24 14:33:34 +02:00
Aurindam Jana
c14c1248ed QmlJSInspectorAdapter: remove onObjectTreeUpdated()
Change-Id: I716ea2417cea5096abc7d740899c6988fe5dcbd8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-24 14:11:46 +02:00
Eike Ziller
a4b16d5130 Show shortcuts in debugger tool buttons.
Change-Id: I3135bebe006305676486cfc7472eb3cec129108d
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-24 11:42:47 +02:00
Hugues Delorme
4026b5338e Svn: fix lack of completion in submit editor
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>
2012-05-24 11:42:39 +02:00
Simjees Abraham
c8e5ab6e92 Debugger: Warning message corrected.
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>
2012-05-24 11:34:42 +02:00
Simjees Abraham
946ca0b358 Debugger: Fix for Apply on Save.
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>
2012-05-24 11:34:35 +02:00
Leandro Melo
bf9bc9914b C++: Fix argument tracking in macro expansion
Due to latest changes the macro arguments were no longer being tracked.
Then they were no available in the document's macro uses. The patch also
makes sure that the preprocessor condition to be expanded is spelled
exactly as in the source code (this guarantees that offsets will be
properly calculated).

Change-Id: I8aff0c3aca0c528ef2c4bcfa56ff1c3da2961060
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-05-23 17:40:05 +02:00
Thiago Macieira
e1cab76344 Fix ICC warnings about commas at the end of enums
They're non-standard. Remove them.

Change-Id: I58dc093c2459747ce0183685d325522fb51e86ab
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-23 16:25:08 +02:00
Eike Ziller
71260c3167 Mac: Avoid more Opt+<char> shortcuts.
Change-Id: I1f2ae70ed8b184be6d1467642924289af1b535a9
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 16:21:36 +02:00
Eike Ziller
6c3a96787c Filter virtual folders out again for simplified project tree.
Broke with e8ee898864

Change-Id: I0e4cc8506580a2cf1884c96c3e7baffd5614d2b1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-23 14:56:46 +02:00
hjk
49ca1643db compile fix on non-mac
Change-Id: I5072f7185ebac9359202ed39463323eddcbc9ceb
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 14:37:37 +02:00
Eike Ziller
1781617f8e Get rid of lots of ifdef Q_OS_MAC for shortcuts.
Using a central enum now.

Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 13:47:13 +02:00
Friedemann Kleint
1a81c33e2f Debugger: Fix compilation on Windows.
Broken by f77cd29e54.

Change-Id: I3cbb4e90ffae45ca1475b0de1a00cb5ee58f966a
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 13:41:36 +02:00
thohartm
7b856ee45e WelcomePage: adjusting minimum size
Task-number: QTCREATORBUG-6818

Change-Id: I030c38e0cc5e370a8f18f5cefc805a51ec730c9a
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-05-23 12:35:04 +02:00
Thiago Macieira
d341e59d3d Fix a warning about integer change of sign with ICC
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>
2012-05-23 12:33:30 +02:00
Thiago Macieira
ae09c64f80 Silence warning about unnecessary use of the containing namespace
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>
2012-05-23 12:33:15 +02:00
Thiago Macieira
5444738c32 Fix a warning about an integer change of sign with ICC
The ttl argument to ServiceGaterer::txtFieldReply is uint32_t.

Change-Id: I7df624eb04d5ffea1b281ed06d38d5e66b7a7319
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-05-23 12:33:02 +02:00
Eike Ziller
f6eefeb1d8 Mac: Allow searching for e.g. Cmd+E in shortcut settings.
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>
2012-05-23 12:23:36 +02:00
Eike Ziller
611ed2f251 Rewrite the shortcut settings filtering.
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>
2012-05-23 12:13:33 +02:00
kh1
928adb5d6b Fix broken handling of unsupported mime types.
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>
2012-05-23 12:08:22 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 10:48:04 +02:00
Christian Kandeler
444445ceb3 Qbs fix for SSH library.
Change-Id: I1b5fab89a8c31f590549545ff54a5a388bca7af6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-23 09:44:30 +02:00
Thiago Macieira
ca4a5e7f03 Fix the rest of the warnings about integer sign change with ICC
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>
2012-05-22 18:51:32 +02:00
Thiago Macieira
2d08cb93fc Fix non-void function that returned without a return value
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>
2012-05-22 18:46:37 +02:00
thohartm
ca8cd6b806 WelcomePage: add delay to filter
Setting the filter is now delayed to allow proper typing.

Change-Id: I9faa2b9810766b2a51bf02d4a14222a9f0a81693
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-05-22 17:06:26 +02:00
thohartm
871a25ff57 WelcomePage: fix search filter
We reduce load on the view by using beginResetModel()
and endResetModel() while filtering.

Change-Id: Id3caacc78cdba1c81d915dc1cbb40ada5bfda522
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-05-22 17:06:18 +02:00
Eike Ziller
48a23cc28b Mac: Avoid Alt+<character> shortcuts
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>
2012-05-22 16:48:20 +02:00
Eike Ziller
d8429000f0 Fix "New" dialog in dark themes.
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>
2012-05-22 16:10:00 +02:00
Eike Ziller
8a7bc472dc Mark canceled searches as such.
Task-number: QTCREATORBUG-6820

Change-Id: Ic14c0ea6f26e4a05c642012b87578f30c817fef7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 13:41:46 +02:00
hjk
cfa703c692 outputpanemanager: rework
Replace "title combobox" and add a "manage" button.

Change-Id: I5453197b207000e6987b7dffd1858facb4b7f32e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 13:12:39 +02:00
hjk
fa188e1f7c debugger: remove unused code
Change-Id: I22e8eb7cc5b632f42aedf71085a1f446bb5fcc68
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-22 13:09:41 +02:00
Christian Kandeler
1558640ed6 Fix qbs build for help plugin.
Change-Id: Ie71eda809f98b76d32a92b86e6351996451ff4b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-22 12:47:36 +02:00