Commit Graph

2336 Commits

Author SHA1 Message Date
Oswald Buddenhagen
b830703c9c Merge branch '2.4' into 2.5 2012-04-12 09:39:18 +02:00
Victor Ostashevsky
9471d96e57 Ukrainian translation updated for branch 2.4
Hope someone will pickup this, switching to 2.5 branch for now.

Change-Id: I498e1fdbfad27ee7824ed2d8bee9c23d4d1c087e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-12 09:38:48 +02:00
Eike Ziller
078d570721 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
2012-04-03 10:03:52 +02:00
Orgad Shaneh
d6a2667dac Dumper: Fix dynamic type dumper for generic struct
Change-Id: Idb5ff44061afa8170afed3737f1be378165732f2
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-02 13:50:45 +02:00
Erik Verbruggen
210c191216 Revert "CppHighlighter: highlight all functions/methods."
This reverts commit e3e67467cfea5934f16a95385761455b0c495a0d

Reason is that it shows errors for calls to function-like macros. For example, any use of Q_DISABLE_COPY results in invalid errors.

Change-Id: I1fd1473ac5a30da5b9aebf6a3f0f11055bdbe8ad
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-29 15:53:23 +02:00
Francois Ferrand
e639a2381f CppHighlighter: highlight all functions/methods.
- Highlight all function/methods (not just virtual methods).
- Highlight as a function even if number of arguments does not match. In
  that case, add a diagnostic message to indicate there are too many/too
  few arguments.
- Fix highlighting of parameters in function declarations.
  These used to be handled indiferently, and they could be mistaken for
  type or field references.
- Properly highlight template method calls.

Change-Id: I6ab463996dda47554839f482da47f561f76663a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-29 14:53:48 +02:00
Eike Ziller
8f6d915948 Merge remote-tracking branch 'origin/2.5' 2012-03-28 16:31:29 +02:00
Thomas Hartmann
f45a787342 WelcomePage: open labs and developer.qt.nokia.com in browser
These webpages are likely to require account data and therefore
we better open them in the system browser.

Change-Id: Iccc158f3e96052fcf30001ec827c23a4a8362fff
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-27 12:01:00 +02:00
Thomas Hartmann
eb19b84f5c WelcomePage: do not allow editing of default session
Being able to edit the default session does not make sense.


Change-Id: I45deee777827e9586ab2c23474f3ad0423f17f55
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-26 11:19:40 +02:00
hjk
e01e899733 debugger: add dumper for internal gdbmi style data
Change-Id: If46366182698b4de8df146625339e1af2f0874bd
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-22 14:57:49 +01:00
Eike Ziller
7931159c09 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
2012-03-21 09:57:56 +01:00
hjk
30fc5d56ed debugger: increase max number of vtable entried from 20 to 100
Change-Id: I9cc62402830f9ca5b2af389df5f790515ed0383c
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-20 11:26:01 +01:00
Friedemann Kleint
faf684e309 Translation: Update and fixed German translations.
Task-number: QTCREATORBUG-7107
Task-number: QTCREATORBUG-7106
Task-number: QTCREATORBUG-7109

Change-Id: I89d760464baa5216e7f34fe82f9bf97714119520
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-19 16:56:17 +01:00
Alessandro Portale
f0b122e3d2 Welcome screen: Turn the "Icon plus link" into a component
Change-Id: I65006bbd0c0b26f84eba2c38e511c53ae23753da
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-19 09:14:00 +01:00
Yuchen Deng
d2d9a80b1d WelcomeScreen: Improve vertical lines showing
Use lighter color of vertical line, from the overall look is more
consistent.
At least, the current design did not feel very comfortable.

Change-Id: I92d1513d475b1aadfc5ac58fc33f4ba84e6a8478
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-16 11:52:54 +01:00
Bai Jing
3a18cc5b08 fix typo in zh_CN translation
Task-number: QTCREATORBUG-7111
Change-Id: I59fe5af962c08c158166e39ec02f411166455672
Reviewed-by: Liang Qi <liang.qi@nokia.com>
2012-03-15 18:00:18 +01:00
Eike Ziller
e5e3f91ed2 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
2012-03-15 15:01:54 +01:00
Thomas Hartmann
51bfb7e351 WelcomePage: fix scrolling of sessions
Change-Id: I8a30d94040fa6fffe318c98782120123093d6666
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 13:08:48 +01:00
Thomas Hartmann
1b50cdce5c WelcomePage: turning widgets into a proper plugin
Change-Id: Ifffaa8f848777f6961b49dff048672b194570fff
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 12:56:34 +01:00
Thomas Hartmann
8beb42dec6 WelcomePage: adjust spacings
Change-Id: I920d763524f77b20518d26a46a11a3a3b0a131bd
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 12:56:22 +01:00
Alessandro Portale
f34e0bbfdf Html5 app wizard: Adapt to QUrl changes in Qt 4.8.0
These changed have been reverted in Qt 4.8.1 (and 4.8.0 for Symbian).

Task-number: QTCREATORBUG-6883

Change-Id: I66e30fe242ffab56f9966a37a152ec2d5c863847
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-14 14:53:42 +01:00
Robert Loehning
01e785f549 Improved German translation
Change-Id: I73a2851c4d8a11777234aaf759760423e5c6a499
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-14 11:35:43 +01:00
Eike Ziller
63f0c0a62f Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri

Change-Id: Ic24b756b41d2a13f3d696dee69553d2c3241ab95
2012-03-14 09:33:25 +01:00
Robert Loehning
19488c0db6 Improved German translation
Change-Id: I64f29c0cbd60ffc0624931898b27241fd0548b2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-13 12:18:37 +01:00
Thomas Hartmann
037a229d64 WelcomePage: adjusting icons
Change-Id: I5f13fb38d7c647f7fed8a84fb0719651786483ca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-13 11:52:34 +01:00
Thomas Hartmann
5c93baca45 WelcomePage: fix vertical "Scrollbar" lines
The lines are hidden now if the scrollbar gets visible. This avoids
visual artifacts depending on styling.

Change-Id: I2bce04273385c05c545fff3d5f1a8f0c898abdb9
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-12 16:14:00 +01:00
Eike Ziller
2ba3f6c929 Merge remote-tracking branch 'origin/2.5' 2012-03-12 15:10:32 +01:00
Thomas Hartmann
b8ad123b5b WeclomePage: unifying look of sessions and recent projects
This is a slight change to spacing and also adds the subtle hover effects
to recent projects.

Change-Id: I3dce69033e782c6f87ef1ef8b251d944bcf9be6e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-12 14:00:59 +01:00
Friedemann Kleint
2ef9f05146 Update German translation for Qt Creator 2.5 Alpha.
Change-Id: I0f3be4dccb1744b8cca738f4720c70317485957d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-09 16:44:37 +01:00
Daniel Teske
6f45ec97f8 Automatically configure examples opened from the welcome page.
Each example can now provide a list of platforms by the examples manifest
.xml file. This list can control the target configuration of the example
when it is opened in the welcomepage.

Change-Id: I893230fd2850b7a1272db71a7f589044d52041d1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 15:28:28 +01:00
Robert Loehning
06b31aaa78 Fixed white spaces
Change-Id: Ifc369d468ed4606425fa161e44bff534434ae765
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-08 14:08:00 +01:00
Thomas Hartmann
2e2e165f3e WelcomePage: add icons to session inplace editor
Change-Id: I4f2b9f55f6738b379610685f58526ee21b0701f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-08 10:36:08 +01:00
Thomas Hartmann
47e4caa386 WelcomePage: crash fix for windows
Change-Id: I77d69bdd11487388163723dffa56a6690ac14240
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-08 10:15:34 +01:00
Thomas Hartmann
deeb8fe351 WelcomePlugin: java script fix
missing var

Change-Id: I3bce04272285c07c545fee3d5f1a8f0c898abdb7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-07 18:04:10 +01:00
Thomas Hartmann
e2aebba8ed WelcomePage: proper line wrapping for paths in sessions
Since qml can only wrap at spaces we have to wrap at file separators
manually.

Change-Id: Id853ab140a46e06fff3abf777ab3b234e749e17c
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-07 17:51:30 +01:00
hjk
272e203b36 wizard: move plain C/C++ app to "Non-Qt project" category
Change-Id: I89f4c37d7b88cbe5d9fdeff7536d00f68c8035ec
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-07 15:36:58 +01:00
Thomas Hartmann
5e36568628 WelcomePage: fix scrollbars of grid view
Task-number: QTCREATORBUG-7012


Change-Id: I015db6f3ccff4a8b28b59f7eab530a07464e771d
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-06 12:48:43 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01:00
Alessandro Portale
9f05e6495d Crisper info icon
Change-Id: I4e0923034e40f94ac84f50617a0719895318a6ba
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-06 12:42:13 +01:00
Thomas Hartmann
b4d79d2d25 WelcomePage: fix mouse area for sessions
Change-Id: I805ee99e075fe4873ce98ae5683729e806010ff8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-06 09:13:01 +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
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
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
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
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
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
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
Orgad Shaneh
014862b773 Rename Recent Sessions -> Sessions
All available sessions are displayed, not only recent

Change-Id: Ib2bc419526135eff414f7c997b2bf603424aa452
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-03-02 11:53:59 +01:00
Aurindam Jana
6f270e7ad2 Debugging: Fix bridge script
Debugging helper library dialog pops up even though the
helper library is not rquired. This patch fixes the case.

Change-Id: Iae259fe6bb4b31d8e957de398a40e4ded2e73532
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-29 13:22:20 +01:00
hjk
dc67ea9292 debugger: add pretty printer for std::shared_ptr
... and polish the std::unique_ptr dumper.

Change-Id: Icbfb7241ae535e833dd983921da6e16fdb2225db
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-28 23:30:02 +01:00