Commit Graph

2336 Commits

Author SHA1 Message Date
Marco Bubke
505c90dbf7 QmlDesigner.NodeInstances: Improve shared memory for pixmap container
Change-Id: I69e815d9f08404931823d9ae5abd0919bd4206b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-09-11 15:41:32 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
2012-09-11 14:02:03 +02:00
Friedemann Kleint
0983e67fd1 Update German translation after Kit renaming for 2.6 Beta.
Change-Id: Ib6bd46e66eb0d44a9e710f884537d6b85b23f1b9
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-11 11:38:35 +02:00
hjk
d34f44f460 debugger: fix display of signed data in arrays
This was a regression introduced with the block dumping for arrays.

Change-Id: I9684fafeb27a9268a2558557f76d1092136975a4
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 00:33:46 +02:00
hjk
19a7f66df3 debugger: add gnuplot based display for QVector
Change-Id: Ic24a0d77906a59bc2c216ef0d6dd655695e2033e
(cherry picked from commit 41ac231ddfbabec6c09101345cf4d1370646f027)
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-10 12:16:46 +02:00
hjk
0af79be114 debugger: add dumper for Utils::FileName
Change-Id: I2b9736d0c0cb3ef0e981d57c31ad84fcb72719d1
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-09 00:51:25 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Eike Ziller
a8c524d40a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/wizards/qtquickapp.cpp

Change-Id: I6ece61c73bc32e93912ad1b489871c597ab60d5b
2012-09-05 13:42:31 +02:00
Tobias Nätterlund
f8954ab962 QNX: Fixed compilation for BlackBerry QtQuick2 template
Change-Id: I5c15c6c6ac69dbf46f676d4f330ed75a2f923c85
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-09-05 07:34:52 +02:00
Alessandro Portale
8d6566b68b QtQuick 2 Application Wizard
This patch adds a new variant of the good old ugly
QmlApplicationViewer wizard. The new one is QQuickView based,
and thus targets QtQuick2

Change-Id: I049223f644029e75bd15120b003c0ce4907a547a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-04 20:32:33 +02:00
Oswald Buddenhagen
a32e243e61 Merge branch '2.6'
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
2012-08-30 20:43:02 +02:00
Marco Bubke
93e329e1eb QmlDesigner.NodeInstances: Use SharedMemory for image transfer if available
Sending images over the local socket is slow, but the Mac has a 4MB limit
shared memory. So we now use what we get and than fallback to the local
socket.

Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 17:24:47 +02:00
Orgad Shaneh
3518934e24 Dumper: Use Latin1 as default for char array
Change-Id: Ia3e2fc737c4d40e9b8bce0fbb147fe3d8a523351
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 09:09:17 +02:00
hjk
69059fef8a debugger: handle type code "Method"
Seems to be new use in mingw 4.6.

Change-Id: I7331e3be3c14fed86d4eebf333ab4b01d1b237bf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-28 12:23:29 +02:00
hjk
09d173b188 debugger: add dumper for some internal classes
CPlusPlus::{Literal,Identifier,IntegerType,NamedType,TemplateNameId}

Change-Id: I1c71be1e284c69c09d8257696feda2974f083c33
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 16:56:36 +02:00
hjk
796c049e38 welcomescreen: remove behaviour on opacity
It's effectively an single-step from almost-off to on my screen
(perhaps a bug?), but there is no need to make an otherwise
quick startup artifically appear 0.45 s longer.

Change-Id: Iecd583d03393a56b49a0da446920682ce02bfdb4
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-08-27 12:25:23 +02:00
hjk
c8b180a55b debugger: also report sizes of anonymous structs
Change-Id: Ibd7397ddf9b70db599befe8cc99fcf7147b959e6
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 17:03:23 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Alessandro Portale
0418e6dc64 Making the QmlApplicationViewer Qt5 compatible
This patch makes a "QmlApplicationViewer" based application from
the Qt Quick app wizard buildable and runnable with Qt5. Note,
that this is still QtQuick 1.1. We are still missing a QtQuick 2.0
based pendant of QmlApplicationViewer.

In addition (separate patch), we may want to tweak the wizard
flags in a way that the wizard allows to create a "Qt Quick 1"
application for a Qt5 target. (Or perhaps we explicitly do not
want that, because we want the developer to use QtQuick 2 with
Qt5?)

Change-Id: Ie3fc8a77a1ff4fba3244f2047d2685c570014356
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 12:17:37 +02:00
hjk
7e884db7fb debugger: fix reporting of type size from python dumpers
Change-Id: I46ed81d3c0bf06e8c7b6a80266ea1b833120e90e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-21 16:11:18 +02:00
Orgad Shaneh
1d209b9c3e Dumper: Respect dynamic type option for locals and references
Task-number: QTCREATORBUG-7504

Change-Id: Ib49b4189e84cd4d3539ec9bbbada373f306ca68d
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-20 15:14:31 +02:00
Eike Ziller
92bdd2b7fa Merge remote-tracking branch 'origin/2.5' into 2.6
Conflicts:
	src/plugins/coreplugin/progressmanager/progressmanager_win.cpp

Change-Id: I7c5168894bd202f9fec8fd3278fad8c3b4f4449c
2012-08-20 13:12:25 +02:00
Pierre Rossi
f1774930cc French translation fixups
Mostly typos and grammar mistakes.
Credit goes to Fabrice Nicol for reporting this and suggesting better
translations.

Task-number: QTCREATORBUG-7717
Change-Id: I0c9f3e7731f0830f7f493aed6365af1a27e63724
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-20 10:01:37 +02:00
hjk
894e75aaf0 debugger: fix QStringList dumper
Did not take into account a non-zero 'begin' after a takeFirst().

Change-Id: Icaa1f87c18b1dec7778c4322fd971c9becedcce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-15 18:15:11 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +02:00
thohartm
156bfd2e7f Fixes layout in welcome page
For some languages (e. g. russian) we have to wrap.

Task-number: QTCREATORBUG-7675
Change-Id: Ib49a2c7b11a16228010934db89c5c0e60b8e465c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
(cherry picked from commit ed0c57ee5a)
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-08-06 10:43:27 +02:00
Friedemann Kleint
64651be53e First update of German translation for 2.6.
Change-Id: Ie8d41e66ebeb2cca88bb007037a4f452802171e9
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-08-02 16:40:02 +02:00
Orgad Shaneh
e2a50ef71d Dumper: Always respect Use Dynamic Type option
Task-number: QTCREATORBUG-7504

Change-Id: Ifdc3f541eb67c36ea0cb5e61a7e5954c39cd75c4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-31 18:17:00 +02:00
Robert Loehning
5635272b44 Improved check for NULL-pointer deref
Change-Id: I99fac91fe997a8f6437998687cf9d30557fa818e
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
2012-07-27 16:41:13 +02:00
Robert Loehning
ed7c80d4c6 Normalized connect()s
Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:12:43 +02:00
Orgad Shaneh
99629d1059 Dumper: Missed upcast -> downcast rename
Change-Id: Ib16cf6356a94e652f09eadaf46c8579a801cc580
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 14:12:45 +02:00
Orgad Shaneh
78d59afa8d Dumper: Rename upcast -> downcast
Change-Id: I776373da348a961e3daf2c45bbbb84ca4736512a
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 13:47:13 +02:00
Eike Ziller
42f4595e37 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/cplusplus/cplusplus-lib.pri

Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
2012-07-24 14:17:33 +02:00
Pavel Fric
78d72c916b Update Czech translation
(take 2)

Change-Id: I8e9626701b7cc1c2adf99e3567d35a2ae37b98f7
Reviewed-by: Tomas Pospichal <tm.pospichal@gmail.com>
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-23 15:21:40 +02:00
hjk
d92df40125 debugger: fix display of member function pointers
Change-Id: I957e805aad45bf62b6fb8318accd29f54b474b11
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:01:26 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Eike Ziller
93cf0f126e Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/zeroconf/embed/DebugServices.h
	tests/system/shared/project.py

Change-Id: I990f6b87ef8570317caf705bbca465a1a01f64b2
2012-07-19 09:16:52 +02:00
hjk
7ba0a4de9c debugger: add dumper for Core::Id
Change-Id: Ibcc5b0e80acf037ed87b79ae4f52a1b0677388eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 12:39:54 +02:00
Eike Ziller
5e3998dd16 Make Plain C/C++ wizard more consistent over platforms.
Since it creates a console app also create a bundle-less app on Mac.

Task-number: QTCREATORBUG-7304
Change-Id: I00749f0d8a4c02bd80d4e7468b3abea552db23dc
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-17 12:54:02 +02:00
Orgad Shaneh
19fa243ef7 Dumper: Fix Qt namespace resolution
qqNs should not be called directly

Change-Id: I845b5c1b9af3fbf79bac7a5ab85dc054678e3e53
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 15:01:29 +02:00
Tobias Nätterlund
a7ac2bb559 New QNX plugin.
This plugin adds support for cross-compiling, deploying, running
and debugging on a PlayBook or QNX Neutrino device.

Change-Id: I0da7ccee40bd7ce4c0d6bdc6884d48ef23167dac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-13 15:37:34 +02:00
Pavel Fric
aed4d1058e Update Czech translation
Change-Id: I8bdbb7ecadad3fb61c70a54484cbc74b51e391c2
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-13 11:02:22 +02:00
Sergey Belyashov
967d0ebc58 Updated Russian translation
Change-Id: I3a7b2168828866d5e0ba0a1c8438cfea5a0c7e07
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-13 10:21:12 +02:00
Montel Laurent
96b7d4a182 Fix french translation.
We need to add \n at the end otherwise error string with paste at the
end => confusing message.

Change-Id: I9a0c2cbdf2322b04f75c7b273925e15d2f10c68d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-05 16:12:02 +02:00
BogDan Vatra
a16d355dce More Android fixes, add default android device.
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 11:26:56 +02:00
Joerg Bornemann
b1888c76ba adjust deployment.pri to DEPLOYMENT variable changes in Qt 5
X.sources has been deprecated in Qt 4.8.0 and removed in Qt 5.

Change-Id: I3d5228bd6db6d3eaccd76fc49e9b934263f9922c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-07-03 11:35:06 +02:00
Tobias Hunger
a2e51f97a2 Remove unused member variable
Change-Id: Ia5e6fd8a8bf405a3b48ea4e53762623db37378dd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:57:20 +02:00
Marc Mutz
7eaaab6e73 Add spaces between macros and string literals
Commit fa66a540 fixed string literal and macro concatenation
some time ago, but while it changed "literal1"M1"literal2" to
"literal1" M1 "literal2" it didn't touch M"literal". This patch
changes this to M "literal" for consistency.

This patch is the remnant of a cherry-pick of a C++11 compilation
fix equivalent to fa66a540 from KDAB's branch of QtC 2.4.0.

Change-Id: I87644e888a7e74b18d4b1ca10786cdc3fa798453
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 12:47:27 +02:00
hjk
78c8ed5bb9 debugger: add dumper for QFiniteStack
Change-Id: I5c90eaaf5d43d03118470b0247511e65b7336ea6
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-12 17:33:29 +02:00