Commit Graph

21107 Commits

Author SHA1 Message Date
Tobias Hunger
ebb238c885 Git: Fix ignore whitespaces/patience
Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-02 13:03:12 +02:00
Tobias Hunger
7efb3c35a5 VCS: Fix auto-opening on files in VCS
Fix auto-opening of files under version control for VCSes that need it
(e.g. Perforce).

Task-number: QTCREATORBUG-5312
Change-Id: Ifc26d062c0f2a92a06d83ccc8664640699e5dc5d
Reviewed-on: http://codereview.qt.nokia.com/2450
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-08-02 12:44:55 +02:00
Thomas Hartmann
87fea757fb QmlDesigner.propertyEditor: fix for Image (2)
Task-Number: QTCREATORBUG-5699
Change-Id: I819e50a6dd3f1a78112bc29b7c4c44284d25f21a
Reviewed-on: http://codereview.qt.nokia.com/2505
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-02 11:59:51 +02:00
Thomas Hartmann
aa2ba4c2a8 QmlDesigner.propertyEditor: fix for Image
Task-Number: QTCREATORBUG-5700
Change-Id: I8f3c5db7740aa4a18e09b9b7445362a5cfb33941
Reviewed-on: http://codereview.qt.nokia.com/2504
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-02 11:58:55 +02:00
Thomas Hartmann
3571b9f31a QmlDesigner.propertyEditor: fix for border image
SourceSize is read only.

Change-Id: If5fe2e25026098efde942bbc63948fd3e27f6545
Reviewed-on: http://codereview.qt.nokia.com/2506
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-02 11:58:35 +02:00
Thomas Hartmann
c1850305e6 QmlDesigner.propertyEditor: crash fix
We did not handle the case that a gradient is a binding.

Change-Id: Ib6892420c6d5de7522cb2b051ff2b046ab781c14
Reviewed-on: http://codereview.qt.nokia.com/2503
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-02 11:47:26 +02:00
Jarek Kobus
3e8ffed099 Update Polish translations
Change-Id: I949a1c40fe9555857a77066b966be2928c26f1ad
Reviewed-on: http://codereview.qt.nokia.com/2502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2011-08-02 11:45:35 +02:00
Tobias Hunger
dd5ccf3d85 P4: Allow for reversal of unchanged files
Allow for reversal of unchanged files in perforce: Just close them again.

Task-number: QTCREATORBUG-3786
Change-Id: I52266b9f7d0bbaf3139cf9fd0ee5e3b47e7a3d58
Reviewed-on: http://codereview.qt.nokia.com/2501
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-02 11:42:41 +02:00
Marco Bubke
26fbb50dc2 QmlDesigner.NodeInstances: Show binding in text if invalid
If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-02 10:22:34 +02:00
Kai Koehne
bc74ee3393 QmlProfiler: Fix warning about unused variable
Change-Id: I274b844215eeebb33e81bd7df6b07862286fcefe
Reviewed-on: http://codereview.qt.nokia.com/2446
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-08-02 08:27:42 +02:00
Fawzi Mohamed
17c88cb2e7 filemanager: fix regression when trying to save read-only file
When saving a read-only file, a dialog should appear with
Make Writable / Save As / Cancel should open.
Avoids relying on permission error to detect read-only files as
qfsfileengine_unix.cpp treats errno == EACCESS as a QFile::OpenError.

Change-Id: Icdffdc4617c8ef2b58d58aeedbb2b454d0da9465
Task-Number: QTCREATORBUG-5066
Reviewed-on: http://codereview.qt.nokia.com/2442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-08-01 18:51:41 +02:00
Christian Kandeler
4b6d4d08f0 RemoteLinux: Allow non-editable device configurations.
Change-Id: I2e77a9c6c13addbe58c76b9c0312be42d6e5feb3
Reviewed-on: http://codereview.qt.nokia.com/2449
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-08-01 18:01:34 +02:00
Christian Kandeler
5f5ea30662 RemoteLinux: Rename class.
It referenced Maemo, but is no longer tied to that platform.

Change-Id: Ie400e5182729fa1a3bc95a1900743ac376cfd5e7
Reviewed-on: http://codereview.qt.nokia.com/2448
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-08-01 17:46:32 +02:00
Christian Kandeler
04edb4513c RemoteLinux: Overhaul deployment infrastructure.
- Introduce generic and Madde-specific deploy configuration widgets.
- Move project file update logic into dedicated class.
- Generic deploy configuration widget no longer has the ability to change deployment settings via the GUI, because we cannot know which qmake scope to use for that.

Change-Id: Ie542a0852c8aa1c6b416cd7aece4e48c1cc2de7c
Reviewed-on: http://codereview.qt.nokia.com/2445
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-08-01 17:31:26 +02:00
Friedemann Kleint
bfa29c3efc Debugger[gdb]: Replace qptrdiff_t by any valid pointer type.
For dumping Qt 5 types.

Change-Id: Ie5b051f73e6ae72a469133be0102de5dffa71db9
Reviewed-on: http://codereview.qt.nokia.com/2447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-01 17:01:23 +02:00
Thomas Hartmann
914f12baea QmlDesigner.rewriter: string fix
Change-Id: I9a46704c24bdd9ddfd24ba2cf76eb2573f1cf5ef
Reviewed-on: http://codereview.qt.nokia.com/2441
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-01 16:37:57 +02:00
Eike Ziller
bfed87f9c4 Avoid multiple context menus popping up.
On Mac in debug mode, right-clicking on extra text area would first open
the markers menu, and after that the menu where you select which debug
widgets to show (like Stack or Locals and Expressions).
Opening the markers menu in a context menu event on the extra area is
both the more sensible thing to do, and works around the Mac
inconsistency.

Task-number: QTCREATORBUG-4699
Change-Id: I38efaffac80a98773deeeada3d0e3ef4f872c03b
Reviewed-on: http://codereview.qt.nokia.com/2434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-08-01 13:27:49 +02:00
Friedemann Kleint
1066cf7359 Debugger[gdb]: Fix crash when stepping over QLocale initialization.
Check the index before the array is accessed in the call item.

Task-number: QTCREATORBUG-5576
Change-Id: I3f533ef76af42dad97c93087f2d434b58fdedd44
Reviewed-on: http://codereview.qt.nokia.com/2044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-01 13:21:20 +02:00
Eike Ziller
81bb1c98a2 Make sensible use of global analyzer settings
Project settings now have the option to use the global settings (on by
default), or custom ones.

Task-number: QTCREATORBUG-5445

Change-Id: I6602b53a6e7823150773e8461ef9db39b7546e98
Reviewed-on: http://codereview.qt.nokia.com/2163
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-01 13:20:05 +02:00
Daniel Teske
7b940d953c Remove essential dead code setting PYTHONPATH
The code was changed from #ifdef Q_OS_WIN to
sp.toolChainAbi.osFlavor() == Abi::WindowsMSysFlavor, which means it was
effectively disabled the last 5 months except in very rare cases.
Also Danimo confirms that the code is no longer needed.

Change-Id: Ia99d9d12415757b3d1e329a631cff0d78caf7804
Reviewed-on: http://codereview.qt.nokia.com/2218
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-01 13:19:43 +02:00
Daniel Molkentin
46d29819d4 Remove superflous connect statement.
Change-Id: I964e3765c4b499e291539d9031d66c8f35642abe
Reviewed-on: http://codereview.qt.nokia.com/2437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-08-01 12:29:34 +02:00
Eike Ziller
f391c4d82e Remove warning about missing file.
The file is created only at qmake run.

Change-Id: Ie3e07ee6e66aeb660a8bf9960e4ff198851c19a8
Reviewed-on: http://codereview.qt.nokia.com/2433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-08-01 12:21:53 +02:00
hjk
be4d9b946f fakevim: more interaction for entering ex commands
Change-Id: I64e4d662fa9c89d4ac6a6d8b83711f01780ceaa6
Reviewed-on: http://codereview.qt.nokia.com/1700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-01 09:34:21 +02:00
Friedemann Kleint
d3e1a75b9b L10n: German translation for 2.3.
Change-Id: I2a0ee7db27dba27d74a1d6a10a7e4ca7cb2d1282
Reviewed-on: http://codereview.qt.nokia.com/2428
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-01 08:56:03 +02:00
Friedemann Kleint
c47b0805d2 tr()-Fix: 'Report bug' needs '...'
Acked-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I892df68c1e9eb5f45275c1a441903279ca1ce665
Reviewed-on: http://codereview.qt.nokia.com/2427
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-01 08:55:46 +02:00
Friedemann Kleint
ee7b327f4c Debugger[CDB]: Fix bug in updating pointer-type watch items.
Collapse pointer-type items in watch symbol group when updating.

Task-number: QTCREATORBUG-5652
Change-Id: I077120c7352da5bc330bb000786a50432bb47738
Reviewed-on: http://codereview.qt.nokia.com/2424
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-01 08:38:38 +02:00
Daniel Teske
e21c7372ab Disable debug output in QtVersionManager::updateFromInstaller()
Change-Id: Ifc1f037796a4a59585f34c8b043d0573c88959da
Reviewed-on: http://codereview.qt.nokia.com/2402
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-29 23:45:27 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3'
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
2011-07-29 17:57:59 +02:00
Kai Koehne
7aaab4d050 QmlDbg: Don't wait infinitely for messages on application output
We only connect to the port when we get a 'Waiting for connection ...'
message on application output. This was done mainly to avoid lots
of failed connects, and therefore an unresponsive UI on Windows.

However, the application output might be redirected for various reasons.
Therefore fall back to busy connect after a certain time (4 seconds
for profiling, 8 seconds for debugging).

Change-Id: Ie1b943f678ced40c030cc134493a2adf7e3bc9df
Reviewed-on: http://codereview.qt.nokia.com/2323
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-29 16:32:02 +02:00
Kai Koehne
52d2987e50 Provide qmlviewer in external tools menu
Quite a few people have asked for previewing a .qml file in qmlviewer,
independent of the current project format.

Change-Id: I2d012282b035cbf977de1994b6c2ace31f3cdfd5
Reviewed-on: http://codereview.qt.nokia.com/2397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-29 16:29:58 +02:00
Tobias Hunger
f9d72df0d0 GCC: Fix parsing of gcc 4.6 output
* Add unit test.
 * Tweak regexp to make the new unit test pass.

Task-number: QTCREATORBUG-5634
Change-Id: I31da8e3ac7fb1c3c5129b4fed6a228d0a73a09ea
Reviewed-on: http://codereview.qt.nokia.com/2395
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-07-29 15:51:03 +02:00
Friedemann Kleint
796e1fb442 QtVersion: Set qmakeIsExecutable to false if qmake crashes.
This prevents literally dozens of crash dialog boxes on Windows.
Check for a crash in the helper library and in updateVersionInfo
consistently whatever is called first.
Initialize qmakeIsExecutable in 2nd constructor as well.

Change-Id: Ifafb7b3edfae8826ac062d634a39a2a804446942
Reviewed-on: http://codereview.qt.nokia.com/1661
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-29 15:22:09 +02:00
Kai Koehne
289acee78a QmlDbg: Fix behavior when re-running the same run control
Change-Id: Icb405b4751fc885d8b96d1daec3653236b564ef0
Reviewed-on: http://codereview.qt.nokia.com/2352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-29 15:07:43 +02:00
Tobias Hunger
4453554cf4 GCC: detect compiler setting in C locale
Run detection of GCC compiler settings using the C locale. This
should fix detection of some settings in non english locales.

Task-number: QTCREATORBUG-5637
Change-Id: I3ea74ce5374fb03ea0cd43566ee302c635e02cd4
Reviewed-on: http://codereview.qt.nokia.com/2387
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-07-29 14:42:28 +02:00
Daniel Teske
b407a51c37 Show baseEnvironment changes in QmlProjectRunConfigurations's widget
That react to editing qt versions and selecting a different qt version.
The environment also depends on the available toolchains, that is
not taken into account.

Change-Id: I70fc1d444a0cbceb4fcb35fb7961bac8a0db9c14
Reviewed-on: http://codereview.qt.nokia.com/2353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-07-29 12:19:27 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-29 12:19:11 +02:00
Daniel Teske
242b4280f9 RemoteLinuxConfiguration: Remove unneded code
The RemtoeLinuxConfiguration is already connected to proFileUpdated
which is emitted on changing the buildconfiguration.

Change-Id: Id3990853ef95fd7e562fdd4e67ef790cf0523387
Reviewed-on: http://codereview.qt.nokia.com/2340
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-29 12:18:17 +02:00
Daniel Teske
a97999dfee ProjectExplorer: React to debuggersChanged() signal by RunConfigurations
And update the run actions in response to that.

Change-Id: I45e6ada3ff5e2b529636a3d8826114db3d1650be
Reviewed-on: http://codereview.qt.nokia.com/2339
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-29 12:18:06 +02:00
Christian Kandeler
c031d4564e RemoteLinux: Fix key deployment dialog.
When aborting the file dialog, the deployment dialog would not close
on its own.

Change-Id: I614f199b9fd486593e12b18f7f536561e7edae1d
Reviewed-on: http://codereview.qt.nokia.com/2388
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-29 11:54:50 +02:00
Christian Kandeler
791ee38298 SSH: Support password input for private keys in non-GUI applications.
Change-Id: Ibd5e47409e92edb6909053d7f17e67b6fa72e642
Reviewed-on: http://codereview.qt.nokia.com/2384
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-29 10:17:37 +02:00
Friedemann Kleint
a65983219a Debugger[CDB]: Breakpoint pass (ignore) count needs decimal prefix.
Task-number: QTCREATORBUG-5654

Change-Id: Ia69c582c342b5e00b5d267320f85efeb49b449f2
Reviewed-on: http://codereview.qt.nokia.com/2379
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-29 08:57:24 +02:00
Christian Kandeler
d037858091 SSH: Allow creation of encrypted keys.
Change-Id: Id896246ad9f82d37cc7594c80e5bcf9c042149ce
Reviewed-on: http://codereview.qt.nokia.com/2351
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-28 16:55:10 +02:00
Christian Kandeler
70407c73e5 SSH: Produce "mixed" key files by default.
I.e. the private key in PKCS8 format, the public key in a format
suitable for OpenSSH's authorized_keys file. Seems like the most
pragmatic solution for now.

Change-Id: I02d9bf4d98d836d9fc33453bff0b3f4834e7e173
Reviewed-on: http://codereview.qt.nokia.com/2350
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-28 16:53:35 +02:00
Christian Kandeler
a82551641f SSH: Support encrypted private keys in PKCS8 format.
Change-Id: I2fd10c1992442317b3ba7a7012f66a328930ef84
Reviewed-on: http://codereview.qt.nokia.com/2349
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-28 16:49:23 +02:00
Christian Kandeler
344e00aabe SSH: Fix PKCS8 key reading.
Change-Id: I68db752269119cc4231151991eadf5ba176f056e
Reviewed-on: http://codereview.qt.nokia.com/2348
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-28 16:47:58 +02:00
Tobias Hunger
aa3114750f Fix *bool assignment
Change-Id: I1497515ea3a7fc4d25aaf80fe1a95f5889f740eb
Reviewed-on: http://codereview.qt.nokia.com/2345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-07-28 15:52:11 +02:00
Daniel Molkentin
a687ead840 Add Help Menu Entry that points to the bug tracker.
Task-Number: QTCREATORBUG-5098
Change-Id: Ibed9e8eea98cb716f2eff29582a39e133c7d8607
Reviewed-on: http://codereview.qt.nokia.com/2221
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-28 15:39:06 +02:00
Friedemann Kleint
fa49c70091 Debugger: Fix compile warning about GlobalOption deletion.
in QSharedPointer.

Change-Id: Ida488ce33a74fe0fc06c31b42e44365f7d038356
Reviewed-on: http://codereview.qt.nokia.com/2347
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-28 15:27:49 +02:00
Tobias Hunger
a3ecfca8b5 VCS: Export ComboBoxItem
Change-Id: Ic4ecd84a7ecf2d82e48d48721c3c4be3fca65717
Reviewed-on: http://codereview.qt.nokia.com/2344
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-07-28 15:05:32 +02:00
Friedemann Kleint
a1ffc4a19f Debugger: Fix crash in stack frame layout display.
The option is also enabled when the index is invalid.

Task-number: QTCREATORBUG-5650
Change-Id: If1efb900d29724e5c43db1589c797197fae67bd2
Reviewed-on: http://codereview.qt.nokia.com/2342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-07-28 15:04:10 +02:00