Commit Graph

23295 Commits

Author SHA1 Message Date
Robert Loehning
c283323afd Squish: Fixed searching for external tools
Change-Id: Iad16f3e7a7a4c886bcd2b7eb9bf94ded9926d37f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-03-05 17:58:15 +01:00
hjk
63f3b2feb6 debugger: compile fix after d48136f312
Change-Id: Ibd7c9cafd4b16278e1db19155b285dd0ad2436cc
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 17:29:06 +01:00
Tobias Hunger
52f98b1af8 CPaster: kde paster cleanup
Change-Id: I4884918ba6564965e0fb1df50951e3fd32e2c0eb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:27:35 +01:00
Tobias Hunger
4f6a5b390b CPaster: Prefer ITextEditor over BaseTextEditor
Change-Id: I7441ec514cebae6a6a0166463a7362d9d9b178a8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:27:20 +01:00
Tobias Hunger
f4cb1ae735 CPaster: Fix layout in submit dialog
Change-Id: Ie8838bc809b683a4d1d96360dc0bf8f33233f56b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:27:04 +01:00
Tobias Hunger
b1683641d4 CPaster: Fix pastebin.com
* Update to new API
* remove unnecessary settings page (pastebin no longer offers subdomains)
* Set post expiration to one month

Change-Id: Ic9947e7227858b87e5dab15c3ce15366004a10c7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:26:46 +01:00
Tobias Hunger
501346c3ae CPaster: Update mime types
Change-Id: I98b2dd5621f230e0d7ed76eaead59b88464b6198
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:26:01 +01:00
Tobias Hunger
228b7ccee9 CPaster: Update pasting to pastebin.ca
* New API

Change-Id: I944a0fe52396ee1b3197b4bddc1744188eb40e90
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:25:32 +01:00
Tobias Hunger
abed438cb5 CPaster: Add Cpp protocol
Change-Id: Ic76ba31061420613683fd683125a32a3c583c84a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:24:36 +01:00
hjk
98565438c3 debugger: fix QDir gdb pretty printer for Qt 4.8
Change-Id: Iff0f28b37abed29920379302dc540d46588fc787
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 17:18:42 +01:00
hjk
a913f3f68c debugger: small fixes for semi-automated tests
Change-Id: I3e2b14aae33ef9cec43c5cea947360e75e19c2c1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 17:18:16 +01:00
hjk
ce6a80f337 debugger: extend semi-automanated tests to one level of expansion
Change-Id: I9063f4eecfe4c42926771cc46539932b4e353b8d
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 17:17:51 +01:00
Tobias Hunger
8973ef31cc Git: Do not pull --rebase when changes are not stashed
Git will not do a pull --rebase when there are changes. So we
now abort if the user did not stash them instead of trying to
pull.

I do not want to revert user changes implicitly.

Task-number: QTCREATORBUG-7031
Change-Id: Ic6041755938be36d8ecdbcbac373b5c38642360d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:15:26 +01:00
Kai Koehne
d48136f312 Gdb: Notice when remote gdb process shuts down
Make sure notifyInferiorExited is called when we get a
'Remote connection closed' message.

Change-Id: I578d62e29ed30243eb7693e641ad809cccd0fcae
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 17:08:38 +01:00
Leena Miettinen
5f6ad79a14 UI text: use single quotes to emphasize variables
Change-Id: I7d5ac28e27d942b7979aaf46cd464ba7989d5d02
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-03-05 16:41:49 +01:00
Leena Miettinen
2ade54ff17 UI text: use sentence style caps for labels
Change-Id: If17c5a276769f0a1b27b7e1cb67209747328fdb1
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-03-05 16:41:34 +01:00
Leena Miettinen
1df59bb54f UI text: end messages in a full stop
Change-Id: Ia70f4859b5cfe4435a4119a3b6b74dca625c26a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-05 16:06:06 +01:00
Leena Miettinen
e210e6c0c1 UI text: use full stops in the end of messages
Change-Id: I6292db7629cbbe466a33874475c40965fa57575f
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 15:38:07 +01:00
Leena Miettinen
cc93e333cf UI text: use full stops in the end of messages
Do not use (s) to indicate plural form

Change-Id: Icb10917be23993c49bb2edab34daeb5ee4c6a5a4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-05 15:19:29 +01:00
Joerg Bornemann
65d151ce5e qbs files updated
Change-Id: I6200e52487e614b905fdb0676bfaf67fd0ea55b9
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 14:42:14 +01:00
Fawzi Mohamed
ff7fb31484 zeroconf: fix registering of types (adding Qlist of ErrorMessages)
Change-Id: I0017bec5adfb4aceb95871d018ca71083fac8f29
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-05 14:39:26 +01:00
Eike Ziller
9c9316b9e7 Merge remote-tracking branch 'origin/2.5' 2012-03-05 13:48:48 +01:00
Christian Kandeler
0d079a6339 RemoteLinux: Use toMap() and fromMap() to serialize device info.
One more step towards extracting an abstract base device class.
Note that the device settings now go into a dedicated file, like
the Qt version and toolchain information, and no longer into the
QtCreator.ini file. Reading the "old style" settings is still
supported.

Change-Id: Ic4766420930c1ab650d72068d3f6d188aa9c203b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-05 12:53:15 +01:00
hjk
709f24b0e0 debugger: fix QDir gdb pretty printer for Qt 4.8
Change-Id: Iff0f28b37abed29920379302dc540d46588fc787
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 10:59:01 +01:00
hjk
3c16aaf568 debugger: small fixes for semi-automated tests
Change-Id: I3e2b14aae33ef9cec43c5cea947360e75e19c2c1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 10:58:14 +01:00
Christian Stenger
bf993e1fda Squish: Fix change to upper-case
Change-Id: I8ce23ea8cc846001d207fc42cb53c02bf9a1b6d5
Reviewed-by: Bill King <bill.king@nokia.com>
2012-03-05 10:47:30 +01:00
Tobias Hunger
339b34a5df Add missing copyright headers
Change-Id: I71f9050a7de9c7b07bcd7d96c8e5fc64a8565fb0
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 10:12:08 +01:00
Tobias Hunger
ff61a6e030 Git: Clean up indention
Change-Id: I10fc926c7f912bf616d3945f231e1848c25f301e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 10:11:12 +01:00
Alessandro Portale
8e3175b124 Build fix for the screenshotcropper tool.
Change-Id: I440006e7fb409c1dc8c2ec111139bc8e0d499b03
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-05 10:08:26 +01:00
Campbell Barton
cb76bacf7a Heres some corrections to inkpot color scheme
- numbers were blue, should be yellow
- preprocessor used wrong shade of green
- bracket matching was missing background color.
- operators were green, when this isn't so for the vim original.

reference
https://github.com/ciaranm/inkpot/

Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit e6ea2db67e)

Change-Id: I15935ff1ed0dd04fab919f22173993bf1ebcb9b2
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 09:59:02 +01:00
cnavarro
4e992d8d03 Fix non-stop mode in gdb when you click continue
When you hit a brekpoint in gdb non-stop mode, if you click continue in the
UI the debugger was killed if the current thread is not the one being
stopped. This is anoying as gdb does not change current thread
automatically. The fix shows the error but does not kill the inferior.
Fixed style issues again.

Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 47def926c7)

Change-Id: I18e8b77b615cfceec402b140337709074ad96dc5
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 09:58:48 +01:00
Alessandro Portale
e5ebe089c6 Add license headers to the screenshotcropper sources.
Change-Id: I3b5526624234100e77e23c68b6b8cb184f5f2a91
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 09:51:12 +01:00
Robert Loehning
453fa17432 Improved sample usage in hasCopyright.sh
Change-Id: Iae3ef128e62faba579ce7385bedc90a4e4600019
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 09:50:41 +01:00
Leena Miettinen
bdae0ae5ad Doc: new wizard layout and options
Change-Id: Ib19010e913ebf1702f89a220f633053bbca28545
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-05 09:14:00 +01:00
Christian Stenger
b3e9343c1d Squish: Added time saver
This avoids fetching the status and resolution again
and again for a test case.

Change-Id: I9445d329eb127830352add23e8ff0b5e2b9adbe6
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-03-05 09:09:34 +01:00
Eike Ziller
09e0c4899b Merge remote-tracking branch 'origin/2.5' 2012-03-05 08:59:13 +01:00
Alessandro Portale
117e468410 Polished split and unsplit toolbar icons
Now, they are crisp and have a shadow.

Change-Id: I374bc731fc4b02d2df6cd09cf13c83eab44c2899
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
(cherry picked from commit 89bb6d5327)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-05 08:41:07 +01:00
Campbell Barton
e6ea2db67e Heres some corrections to inkpot color scheme
- numbers were blue, should be yellow
- preprocessor used wrong shade of green
- bracket matching was missing background color.
- operators were green, when this isn't so for the vim original.

reference
https://github.com/ciaranm/inkpot/

Change-Id: I9bd8357d4f2473fa769aae995e795ded05f970a6
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-03 19:23:18 +01:00
cnavarro
47def926c7 Fix non-stop mode in gdb when you click continue
When you hit a brekpoint in gdb non-stop mode, if you click continue in the
UI the debugger was killed if the current thread is not the one being
stopped. This is anoying as gdb does not change current thread
automatically. The fix shows the error but does not kill the inferior.
Fixed style issues again.

Change-Id: I1a2e484108e936581c7b82c985f2b057263e3d6b
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-03 17:57:05 +01:00
Christian Kandeler
79d2fca375 RemoteLinux: Fix bugs introduced by recent refactorings.
Change-Id: I89eeb0bbd4bdc319e21d077d95eb50f31aa23ecd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-02 19:39:02 +01:00
Kai Koehne
af205ab25d Add TcpPortsGatherer to utils
Can be used to check (non-intrusively) which TCP ports are still available.

Change-Id: I61300f6b7215cb2c0e4a3e6135de305cfd38b5a9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 18:37:39 +01:00
Christian Kandeler
f7e127f740 RemoteLinux: Simplify approach for id assignment.
The current one is awkward and error-prone.

Change-Id: I9450b121d0f01c07507b8cc6d72cb2e1453cf02d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-02 18:16:48 +01:00
Thomas Hartmann
aefb67e618 WelcomePage: replace context panel for session editing
This patch replaces the context panel by extendable list items.
This does not create any visual cluttering on hover and is more
user friendly.

Change-Id: Ib9b283f6972ea7e9ae3dc3155d0c3f1c8fe2e806
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-02 16:40:48 +01:00
Tobias Hunger
4517ef6238 Update copyright check script
Update copyright check script for the new (old) email address

Change-Id: Ib3dbb3505362e57587832467d9a0323b8cde6272
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-02 16:28:25 +01:00
Christian Kandeler
5045852408 RemoteLinux: The device manager should not be itself a model.
The ListModel functionality is only needed in very few contexts,
so we move it into a dedicated class. This cleans up the actual device
manager.

Change-Id: I325bf43a9260ab9a8e484f8972e2d962ea2f1b3e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-02 16:04:01 +01:00
hjk
ecd183a3e3 debugger: fix std::map dumper for gcc 4.6
Change-Id: If81c38ad07c7e0fa40554295e6a0077c54565ba3
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 16:01:17 +01:00
hjk
1bc2a721c1 debugger: reset AUTORUN explicitly for manual tests
Change-Id: Ic71082ebd7779068886b68bce20d7d75c3055c17
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 16:01:03 +01:00
hjk
cce8521c68 debugger: more robust detection of types with vtables
Needed to get the "dynamicType" deduction right.

Change-Id: I30ea14f95110fa405abb3a1cb15293d57be87fa3
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 16:00:43 +01:00
hjk
7a9ed9b72a debugger: fix special case of uninitialized data in manual test
Change-Id: I9489f390008d5fbf73b3e151e9f1d86262d97905
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 16:00:28 +01:00
hjk
b66aeffe0b debugger: fix default value for char * display
Change-Id: I6edff2b83dd1965cd9975a4e90c6deba17a2c375
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 16:00:14 +01:00