feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,335 Commits 108 Branches 368 Tags
021b64b5dfb8776b847d0faffb0619d4d64be112
Commit Graph

2330 Commits

Author SHA1 Message Date
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
Franklin Weng
565c695b32 Add Traditional Chinese translation 
It's a clean version without all obsolete items.

Done-with: Juei-ray Tseng <e222et@gmail.com>

Change-Id: I609f8d6df15f75fa2728c90dab8b8f6d6c7db154
Reviewed-by: Liang Qi <liang.qi@digia.com>
 2012-10-22 10:58:36 +02:00
hjk
3621e3e392 debugger: implement pretty printing for D arrays (gdc compiled) 
Change-Id: If8bf60dcfbb52546bc9c49ba28adddf52163321e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-21 20:24:34 +02:00
Orgad Shaneh
6aaaacd4e4 Dumper: Remove unused variables 
Add a missing call to removeTempFile

Change-Id: Iea21102ed54e372f6c2991ac31fef008962f0638
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-20 14:51:13 +02:00
Marco Bubke
ac4df34db7 QmlDesigner.NodeInstances: Polish items for data collection 
Change-Id: I3ca322ae72b546b0a55162f376a2895642c7a187
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-19 12:20:19 +02:00
mfekari
8b29f4439a Qnx: Update the wizard templates for Qt5 applications on BlackBerry 
Change-Id: I4b17c59b1e25fd453d2fe09fb865832291ffc87c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-19 11:15:43 +02:00
Marco Bubke
e6fe6c0f1f QmlDesigner.NodeInstances: Fix compile 
QQuickView::rootItem() changed to QQuickView::rootObject()

Change-Id: I6aff12f616a5e9a968d3a646bc635c4976750ed4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-19 09:49:22 +02:00
Eike Ziller
9bbafdb506 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/share.qbs

Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
 2012-10-18 13:39:47 +02:00
Marco Bubke
ce911e04c5 QmlDesigner.NodeInstances: Compile Fix 
Change-Id: I1eef61360841c774d6b79887ee312f8d4bf50f8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-18 12:59:22 +02:00
Friedemann Kleint
2f3730ca47 Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming. 
QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
 2012-10-18 11:47:47 +02:00
hjk
9f1d8b66e3 debugger: fix display of gcc's built-in vector types 
Change-Id: I293be4f5c207828c64de30236a25f6c0062346b8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 15:25:04 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
 2012-10-16 17:42:10 +02:00
Kevin Krammer
2910233e52 QNX: use QmlApplicationViewer provided by main QtQuick template 
Reuse the QML application class provided by the standard QtQuick1
template.

Extends qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp with
code paths for Q_OS_QNX

Change-Id: I04a283078299f662d630d9387cedc65100f545a0
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2012-10-15 21:07:01 +02:00
axasia
62b400cde7 Update japanese translation for 2.6. 
Change-Id: I673579a0224df955b041c7a93a5c53e3ef0e7760
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2012-10-15 18:43:36 +02:00
Marco Bubke
174eb7c270 QmlDesigner.NodeInstances: Fix crash for instance without object 
Change-Id: Ia08cdb194e8f67a71cdbddf162cc7f17daa517f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 17:53:58 +02:00
Marco Bubke
19c561c505 QmlDesigner.NodeInstances: Don't send empty image for preview 
Change-Id: I0bb327edd702d395023f433e5225a85ecec02d4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:32:21 +02:00
Marco Bubke
dffb1cde67 QmlDesigner.NodeInstances: Don't create preview for non root item 
Change-Id: I4456cff66c2e532a787f176bd6d62bbda80fb4f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:32:02 +02:00
Marco Bubke
139f564599 QmlDesigner.NodeInstances: Fix node updating 
Change-Id: I2aebcaf618251b85764712be7dd5dc3c863c3ba9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:31:47 +02:00
Thomas Hartmann
c76ddfc489 QmlDesigner.Instances: crash fix 
During destruction both new parent and old parent are invalid.
The intPositioner flag is not updated (isInPositioner()) and we crash.
The check for parentInstance() avoids this.

Change-Id: I5224c58bb461956f7ce2c47349650913975aa836
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-15 14:35:27 +02:00
Thomas Hartmann
16c5a1493d QmlDesigner.instances: crash fix 
NodeInstanceServer::clearScene() deletes the objects.
The m_designerSupport hold pointers to all objects for cleanup
in destructor.

Change-Id: I5ad4361d0c1de6f9eb9fb0d5cd80cf66717ce7fd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-12 10:33:59 +02:00
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
 2012-10-11 21:11:40 +02:00
Marco Bubke
f0d4199dfa QmlDesigner.NodeInstances: Fix rendering code path 
Change-Id: I2a479e85d7ea6f5803d78d3e2ce86849c882c5a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:58:11 +02:00
Marco Bubke
05c1e7925d QmlDesigner.NodeInstances: Fix rendering of child items of components 
Change-Id: I96d888bb97e334ff9a2a8fa3e8c2bcb931b247c1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:55:44 +02:00
Marco Bubke
8542c063ec QmlDesigner.NodeInstances: Create a component with a file path 
We used a url but anyway this is not necessary anymore.

Change-Id: Ia616fca573f941dd638141a05c0c36640fed90e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:55:30 +02:00
Marco Bubke
42aad1fd75 QmlDesigner.NodeInstances: Fix compiling 
Change-Id: Ica08aaadca52bb416346d871bc9555fb450654f6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:55:20 +02:00
Marco Bubke
350d5d9b28 QmlDesigner.NodeInstances: Workaround for Quick 2 
Change-Id: I91c0d841cdff3f502294b5245e1b35407e5fa441
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-10 16:25:56 +02:00
Robert Loehning
3a097c295c Fixed German translation 
Change-Id: Iba3ed9ee222ba5cc886814814df5daf155f24d69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-10-09 17:44:19 +02:00
Kevin Krammer
af4b4e9008 QNX: remove unnecessary lines from project template files 
the "-platform blackberry" command line argument is no longer
required in bar-descriptor.xml files due to Qt being built with
QT_QPA_DEFAULT_PLATFORM_NAME defined "blackberry", thus making that
the QPA loader's default choice.

See mkspecs/blackberry-armv7le-qcc/qplatformdefs.h and
mkspecs/blackberry-x86-qcc/qplatformdefs.h

Change-Id: I35fdaf71adf0bb1b9041da90db857a7074b12cff
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2012-10-09 16:40:12 +02:00
Marco Bubke
baa75926c2 QmlDesigner.NodeInstances: Quick Window Manager Support 
Change-Id: I94239275ebd55bafbd7bc9650409c24471214546
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-09 14:29:26 +02:00
Marco Bubke
ca58138102 QmlDesigner.NodeInstances: More pointer fixes 
Change-Id: Ibffe642952bc135420d123dc1d271f4e2b764749
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-09 14:29:02 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Eike Ziller
2b56943a8e Change the default plugin provider to QtProject. 
Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:39:40 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia 
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:10:50 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
Eike Ziller
68c796e244 Merge origin/2.6 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
 2012-10-05 20:51:31 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Friedemann Kleint
0fc9e7c877 Fix ambiguous shortcuts in the Git submit editor. 
Task-number: QTCREATORBUG-7965
Change-Id: I4f1988a1f3bac7afe1d7195a74bdb874b1041344
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian A. Reiter <christian.a.reiter@gmail.com>
 2012-10-05 15:54:50 +02:00
Eike Ziller
62422de5d0 Remove feedback link. 
The form has vanished and wasn't up to date anymore anyhow.

Change-Id: I40292593e8e705da0b5e47f54ab6c1a519144404
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-05 14:19:27 +02:00
Thomas Hartmann
76759f2400 QmlDesigner: fix qml2puppet .pro file 
Change-Id: I697a5e8d11b0aef926dd79a5e45a63ffdc567353
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-05 12:57:17 +02:00
hjk
ecf8b82cdc debugger: fix QMap dumper/gdb pretty printer for Qt 5 
Change-Id: If1b2dcb6d517b837a135fbdb97cde422122464c3
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-05 11:23:46 +02:00
hjk
4265d47c78 debugger: fix display of QObject object names for Qt 5 
Change-Id: I58ad709575f4846812de3e2109112be170e8e433
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-05 11:23:20 +02:00
Tobias Nätterlund
26ef19061c QNX: Fixup bar-descriptor.xml files 
- Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH
- Make application ID depend on project name

Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-05 09:55:06 +02:00
hjk
009c3f1a26 debugger: use symbolic constants for "Display in Seperate Window" modes 
Change-Id: Iab2b918e94abddb1fb4132c27e0b5f29810d4598
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-05 08:12:26 +02:00
Marco Bubke
a19495ba20 QmlDesigner.NodeInsatnces: Update positioner if binding is changing 
Only if the expression of the binding is changing.

Change-Id: Ief702082dff0ac473c8ade6f3fc0f0cf36e017f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:20:06 +02:00
Marco Bubke
3982bc22d7 QmlDesigner.NodeInstances: QWeakPointer -> QPointer 
In Qt5 QPointer should be used instead of QWeakPointer fo QObject tracking.

Change-Id: Ic9cdfaea77574bcf866716ded62bbf2d350d02f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:19:49 +02:00
Marco Bubke
fb276230fe QmlDesigner.NodeInstances: Recover positioner support 
Change-Id: Ib5e891a8563bfced2af93e4a516ef8f196e8ff1e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:19:02 +02:00
Thomas Hartmann
b9e550f702 QmlDesigner: create stub project to build qml2puppet 
This allows building qml2puppet as part of Qt Creator,
if Qt Creator is based on Qt 5.

For the moment it has to be build manually.

Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-04 17:01:00 +02:00
hjk
b3c6f7be3f debugger: make QByteArray displayable in separate window 
Change-Id: I6ec1e880e1c82415361545f57115353d843ee7f3
(cherry picked from commit ce381a81cf03bb122a9ce4102fbbb56825ce05e3)
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-04 15:16:58 +02:00
Friedemann Kleint
f02c0f64e2 Add a wizard that lets the user enter a code-snippet. 
This is useful when fixing tasks that contain a code snippet.

Change-Id: Idaf523839254eed97a363501f0aba4317d216d1c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-04 14:33:37 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
 2012-10-04 12:23:39 +02:00