Commit Graph

25792 Commits

Author SHA1 Message Date
Friedemann Kleint
23c3f61d1a Add Autodetection for system cdb/gdb for kits added by sdktool.
Introduced special 'auto' value for debugger binary.

Change-Id: I5be4fa148ce9ded06826a7dda647c5ba402dc70a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-09-28 11:15:35 +02:00
Orgad Shaneh
e834d75b04 Yet another s/profile/kit change
Mostly variable names, one string

Change-Id: I9d44cba8ade9266303fe7695b8bc93647710b71d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-28 10:00:23 +02:00
Friedemann Kleint
6dad4586c6 sdktool: Fix MSVC warnings about comparison (!<int> == number).
Change-Id: I74be70ed1693160acab5c4be5da09d004bf0801c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-28 09:59:28 +02:00
Eike Ziller
154f6c859e Add installer target.
Requires Qt Installer Framwork (IFW)

Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-09-28 09:35:08 +02:00
Eike Ziller
14a2ff598a Consolidate the bindist make target setup
Change-Id: Ic6928f2eab43930dc1920bd774798e899a76cabd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-27 19:11:45 +02:00
Robert Loehning
cef7f0869f Squish: Moved test data to data file
Change-Id: I1021a246fa58bf1a9293789d4b19a7bc2f3e486b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-27 18:25:31 +02:00
Robert Loehning
832bc738c7 Squish: Improved checks before working on projects
Change-Id: Ieb230be55b94d00be272cb84796ce8fd22f4f8f7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-27 17:32:39 +02:00
Orgad Shaneh
a5b2d8f5c0 Fix qbs build with MSVC
Change-Id: Ifd6ef279c09d9ec4fb08333b3e9aad8211e42a5e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 16:32:11 +02:00
Leena Miettinen
2207a9a987 Doc: QML Inspector was integrated in Locals and Expressions view
Some functionality was removed. Update text and screenshots accordingly.

Change-Id: Iec9057ac17ddb1c3a27244c74038553f5ab46605
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-09-27 15:21:56 +02:00
Yuchen Deng
57034cf007 Fix crash on startup if config does not exist
Change-Id: I590d52bdf31d7e485cf2351dabed4c587911553d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 14:53:25 +02:00
Friedemann Kleint
282e5ec032 Add toolchain environment for debugger autodetection.
Find MinGW debugger in toolchain path.

Task-number: QTCREATORBUG-7732
Change-Id: Ia1e281669186d0296f7f5718ced37b69864017e7
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 14:45:49 +02:00
Christian Stenger
2a497de23e Squish: Remove unused objects
Change-Id: I62fb45c3057c2c171b16b75052c8461571ec7394
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-09-27 14:37:23 +02:00
hjk
6c99b8f57d bineditor: fix cursor down in small files
The cursor was not movable when the file fit on a single screen
without a scrollbar.

Change-Id: I758eff6d1baa7dd6232c9b10c58ccf42f717ed6f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-27 14:31:46 +02:00
hjk
18cff29d8f bineditor: don't crash when no error string is requested
Task-number: QTCREATORBUG-7930
Change-Id: Ia3b2a21d843ce9de7f61f754da0b276355c377f2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-27 14:31:01 +02:00
Tobias Hunger
e81cfa6e70 Make sure to never write kits/Qt/TCs before they were read
We should be save already, but let's be paranoid...

Change-Id: I925fb94f4cebe4c54e3419e18d307a999055ebbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 14:20:42 +02:00
Orgad Shaneh
ff605d3fbf Fix qbs build
Change-Id: I7b0c983a2a99228595a6daa1da95ca863ba66bcc
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-27 13:31:28 +02:00
Tobias Hunger
14bc65fdff Revert "Make sure to never write kits/Qt/TCs before they were read"
This patch causes core dumps in my work-creator while it works fine
in my test creator. Revert till I find the reason for this.

This reverts commit 5d253b3704.

Change-Id: Ib9912cda15294c28b9136f79675e0e5694788d5b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-27 12:32:35 +02:00
David Schulz
b1bb59aeff Editor: Fix autocompletion under Qt5
Change-Id: Id8ce9ebe53823abe211e43c7c44ec19a24ed63f5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-27 12:23:50 +02:00
Eike Ziller
069ad73fb6 Mac: Fix insource build
Change-Id: Iadbb51b48ea82afc398b59148d603867b0439448
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-27 12:22:11 +02:00
Orgad Shaneh
69e022d112 Git: Fix binary lookup with path setting
Task-number: QTCREATORBUG-7889

Change-Id: I251ef68e8dbb0a70565708053e368db89d5999e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-27 12:09:13 +02:00
Tobias Hunger
6c436988ff Use QtParser in CMake/Autotools/generic project makesteps
Change-Id: Ibe8db500e1b8ed7b473cc07cb00e303fa6bea9d1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 11:55:27 +02:00
Tobias Hunger
5d253b3704 Make sure to never write kits/Qt/TCs before they were read
We should be save already, but let's be paranoid...

Change-Id: I925fb94f4cebe4c54e3419e18d307a999055ebbe
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 11:55:18 +02:00
Tobias Hunger
ac6c11ec19 Git: Simplify code a bit
Change-Id: Iac245c92039f522cc0a599461572f9fd54cf43ae
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2012-09-27 11:50:03 +02:00
Tobias Hunger
917517cd37 Mercurial/Bazaar: Make commit work on windows
Do not keep an open file around when passing the file name to the
editor. The editor won't be able to save on windows since the file
is locked.

Task-number: QTCREATORBUG-5972
Change-Id: Ib424c76d2e3e57d43fdc1e1c222dbeb148669038
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2012-09-27 11:49:54 +02:00
Kai Koehne
74862df789 QmlJSTools: Fix autotest
Remove checking of "TabWidget" element from autotest (got removed
in one of the welcome screen rewrites).

Task-number: QTCREATORBUG-7835
Change-Id: Ic420586eec4195ed8e5de414e88cdf95f451dbd7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-27 11:34:41 +02:00
Thomas Hartmann
d246abe677 QmlDesigner: use import QtQuick 1.0 and not Qt 4.7
Qt5 warns about import Qt 4.7

Change-Id: I1561f957637945d4bc61fb90abd8d0a60599133f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 11:19:39 +02:00
Peter Kümmel
28f8bf07cc msvctoolchain: x64 and amd64 are the same
- show cross and native in gui
- add missing compilers

Change-Id: Id48579d4e5dae3a68ed92c0cd2f41309e4f96753
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
2012-09-27 11:15:10 +02:00
Thomas Hartmann
5a30a70e79 QmlDesigner: QPixmap::grabWidget() is depricated in Qt 5
Change-Id: Ie74c61704573f517586c5acb7a87826942ee7dd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 11:01:18 +02:00
Robert Loehning
05784397c3 Squish: Removed unused functions
Change-Id: I9e12651454a0a35a934d27a890bdeaa55c7ca912
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-27 10:53:29 +02:00
Orgad Shaneh
2991df7639 qbs build: Add libptracepreload
Change-Id: I770d714ffc6ddacc7b5c5b8ef7d2e9340f5ea8fc
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 10:35:55 +02:00
Thomas Hartmann
7da5ba30ec QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5
Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ad535b5b62)
2012-09-27 09:50:39 +02:00
Thomas Hartmann
e82e6749a0 QmlDesigner: removing declarative dependency from plugins
The depedency on declarative is unnecessary.

Change-Id: I2b48bbb109c593ee4a7a2b5f225c57fad3e93bd8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit f488c59f89)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:50:30 +02:00
Thomas Hartmann
7b5d701f31 QmlDesigner: compile fix qmlpuppet with Qt 5
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.

Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit fee6b56a7c)
2012-09-27 09:50:22 +02:00
Thomas Hartmann
2afcd57fbc QmlDesigner: removing dependency on <private/qdeclarativemetatype_p.h>
Removing dependency on <private/qdeclarativemetatype_p.h>
in property editor.

Change-Id: I9c4fa74994bd72570113145c0bb4d9d239a40f08
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit b8caadc334)
2012-09-27 09:50:16 +02:00
Thomas Hartmann
af20741cfe QmlDesigner: removing dependency on private/qdeclarativestringconverters_p.h
PropertyParser takes care of the issue now.

Change-Id: Ib75c47f239fef05cdc3a9032d011d69483c381d5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 40714ca7a0)
2012-09-27 09:50:12 +02:00
Thomas Hartmann
e1a4216936 QmlDesigner: fix compile for Qt 5
The itemlibrary ideally should not rely on private
headers. Fixing this requires heavy refactoring so
we rely on private headers for now.

Change-Id: If52c1254ac164995dbb667b5baa024635f6d3dc8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit b356ad9621)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:50:04 +02:00
Thomas Hartmann
2cd792bfdc QmlDesigner: compile fix for Qt5
Change-Id: I754c28279df7509bf0723789d616b8913148f4d6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit b4612f1902)
2012-09-27 09:49:59 +02:00
Thomas Hartmann
4fe44819e6 QmlDesigner: fix for qmlpuppet and Qt 5
Change-Id: Ie199a0e3d8342fb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 362b8d989d)
2012-09-27 09:49:54 +02:00
Thomas Hartmann
715e16ead4 QmlDesigner: fixing itemlibrary plugins for Qt 5
Adding the .json file and using the correct macro.

Change-Id: I37bede5b4c4a5af002b39b614aeb6c166bd5ddda
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit a42eeecffa)
2012-09-27 09:49:50 +02:00
Marco Bubke
1bd4795524 QmlDesigner.NodeInstances: Fix type registration
Change-Id: I571812c88b323e339f5b4c068f8027d9217da64c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 9e7a8e4118)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:45 +02:00
Thomas Hartmann
ac186ff7ae QmlDesigner: final compile fixes for 2.6 on Qt 5
Change-Id: Iba13f1b03a641f913d69822ddd623d6bfe38825f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:41 +02:00
Thomas Hartmann
1bfd2a0c1f QmlDesigner.qmlPuppet: set QDataStream version
We already did some refactoring on this part in master.

Change-Id: Ia878afa3aa773d2496343e052ababf30da9351d7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:37 +02:00
Marco Bubke
da7c6fb8a3 QmlDesigner.Instances: Fix type registration
Change-Id: I85378c0a2884a7c8886482f38bad24210ef33d69
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit d8d862f261)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:32 +02:00
Thomas Hartmann
5e1ff49f90 QmlDesigner: using 4.8 datastream also in Qt 5
Change-Id: If208a0e3d8342fb62fff1ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 36f9c318ab)
2012-09-27 09:49:26 +02:00
Thomas Hartmann
0303f3b115 QmlDesigner: fixing compile for Qt 5
grabMouseWhileInWindow(); is not an
option in Qt 5 anymore.

Change-Id: Ie198a0e3d83fffb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit cda0c6c3c4)
2012-09-27 09:49:22 +02:00
Thomas Hartmann
ba719477e7 QmlDesigner: fix compile for Qt 5
Change-Id: I34282a36db8af9c5550ee4c9080519ce0c096d8e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 08af509759)
2012-09-27 09:49:18 +02:00
Thomas Hartmann
e7e1b1bea3 QmlDesigner: unused private header
Change-Id: Ife75552afb9d96ac760b0d37f0dbd772a35c498c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 419aabcd2c)
2012-09-27 09:49:13 +02:00
Thomas Hartmann
2c4a89d23b QmlDesigner: removing VariantParser
This class is not used anymore.

Change-Id: I132166e3c290eea204f2c286df20c04343c14d55
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 35b0e0ea2f)
2012-09-27 09:49:07 +02:00
Thomas Hartmann
2c628a939d QmlDesigner: enable build for Qt 5
Change-Id: Ie199aee388342fb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
(cherry picked from commit 3934b9b976)
2012-09-27 09:29:46 +02:00
Thomas Hartmann
ef22900100 QmlDesigner: compile fix for Qt5
Change-Id: Iff39fdf8a58c7e844b087dbab7c112630d6c50ad
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 012fad1dfb)
2012-09-27 09:29:31 +02:00