Commit Graph

30477 Commits

Author SHA1 Message Date
Orgad Shaneh
173da5f45b Git: Set diff base directory for log
Log can also contain diff, base directory is required for correct
apply/revert actions

Change-Id: I9540fc75b1e008a1c8433f121b184f164172a1cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 16:59:42 +02:00
Christian Kandeler
4ec63a7152 QML debugger: Fix remote debugging with port forwarding involved.
Full explanation inside.

Change-Id: Ib39f18282b7d78ebdab53ac2ebe9d4cf1e11c008
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-18 16:22:59 +02:00
Leena Miettinen
35211c04b1 Doc: move docs from h files to cpp files
QDoc does not look for docs in header files.

Change-Id: I4530233d647fdc2f5ca44c73aee7e0125df07979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-18 10:25:28 +02:00
Orgad Shaneh
f029712352 Qbs: Fix install path for styleplugin on Windows
Change-Id: Ic3743df91ac48969c751ebbe78c62adb5b4850bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-17 16:41:52 +02:00
Eike Ziller
4b6de71fd0 Fix issues with having same document open in multiple splits
Sometimes one split would not show the document even though it shows in
the combo box.

Task-number: QTCREATORBUG-9801
Task-number: QTCREATORBUG-9798
Change-Id: Iea79c6f3deb4f1570685794c6eb762f603a36b5f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 16:27:02 +02:00
Robert Loehning
ec6be6640a Squish: Test "Go to slot" in Widget Designer
Change-Id: Idc4517f86035aa5faa1265f275b0ed5f97526d2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-17 16:21:43 +02:00
Leena Miettinen
a5dccb1736 Doc: import statements go to QML files, not pro files
Change-Id: Ia36ffd51add0c92b396e448d8e125848e9754877
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-07-17 15:32:16 +02:00
Aurindam Jana
378d0cd119 QmlDebugging: Reset exception code highlighting
Clear code highlighting when debugging session ends.

Change-Id: I32844444161bbb609864926e12220f9fb0f492e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 14:43:57 +02:00
Sergio Martins
01252c53df Remove semicolon from Q_PROPERTY snipplet.
Change-Id: I3e5ae3eb17701c7c0dceca53011ab9998449f531
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 13:57:30 +02:00
Thomas Hartmann
066b3ab889 QmlDesigner.ContextMenu: fix support for Layouts
We have positioner in QtQuick and "real" layouts in
QtQuick.Layouts.

Change-Id: Ie1c5235820ac698048a229af7ede9d8f57926b19
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 12:29:44 +02:00
Robert Loehning
bcf9b3a171 Squish: Removed now unused Qt versions
Change-Id: I20f87b155485c7e5328a780623b61191cfdb81ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-16 10:49:28 +02:00
Petar Perisin
771fe03cfe Git - couple fixes in branch based auto stash
- do not start stash scope when creating auto stash
- return if reset fails

Change-Id: I471abc1d430351192c46ac78041949ba81f11b09
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-15 16:51:46 +02:00
Thomas Hartmann
f45a01b203 QmlDesigner.PropertyEditor: fixes in ComoBox.qml
Change-Id: I409cd74c90e55006b05eb8cd71fbbfa59811fa29
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:38:22 +02:00
Thomas Hartmann
ba084e663f QmlDesigner.PropertyEditor: enabling layout direction
This has been fixed in the rewriter and meta info system.

Change-Id: I4c78a915a05c01b33f779cf255c5b9c67d3e0001
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:29:10 +02:00
Thomas Hartmann
87aa77fa65 QmlDesigner.Rewriter: support global Qt enums
The global Qt enums are hardcoded.

Change-Id: I5342ef35c63fccecbcfec3aeaec903d99ab63966
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:28:47 +02:00
Thomas Hartmann
d76807eccd QmlDesigner.MetaInfo: fix for the item library
Row has to be a Row.

Change-Id: Ibf84d11ec36790b8fea1943ea4a10e97dfbf98d4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:20:40 +02:00
Thomas Hartmann
cc9b0d5655 QmlDesigner.MetaInfo: fixing isLayoutable()
The major version is the version of the layout.
QtQuick.Layots have version 1.0.

Change-Id: Id83105ab858a74563e8ea6457d91613d20514fcb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:15:00 +02:00
Thomas Hartmann
76cf67f349 QmlDesigner.MetaInfo: fix for propertyCastedValue
Using convert() had the side effect of invalidating the variant.

Change-Id: Iebfbf6a8067343c7c1436d6dec5ef8090821ed33
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:14:13 +02:00
Thomas Hartmann
e207228af1 QmlDesigner.MetaInfo: fix meta system for Qt enums
Change-Id: I87bedb03998d281d4a6bd450cb58d4614ae19187
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:13:39 +02:00
Robert Loehning
d9203dac79 Squish: Skipping 4.7 in tst_simple_analyze on all platforms
Seems to happen on the Linux test machines, too.

Change-Id: Ibd6bdea3be33d50017cae8f051c7e927f7bd24f0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-15 13:10:04 +02:00
Robert Loehning
8050e136e7 Squish: Added kit "Desktop 480 GCC"
Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-15 12:42:18 +02:00
Christian Stenger
9cb5e5c3f0 Squish: Provide mappings for Squish 5 stripped down packages
Change-Id: I987b9d6527f00f543a02f7a2e3dc7f9f7a366fa4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-15 10:36:30 +02:00
jkobus
68f860356e Update Polish translations
Change-Id: Ide7ddf7b1ef7c89224b02a710e84f64cb02a1c15
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-07-14 16:05:28 +02:00
Christian Kandeler
26b8acb25f Support QbsProjectManager in qbs build.
Qbs can come in via the submodule or as an external resource.

Change-Id: I613982135e4a7eca1aeb5c9c305c9974fd65f0fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-12 16:59:13 +02:00
Christian Kandeler
4677389a13 qbs build: A number of missing adaptations to qbs changes.
Change-Id: I37452bad6a51bb8d40a13232d46c575a483c5a6c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-12 14:01:14 +02:00
Robert Loehning
da81c07151 Squish: Don't falsify test data if test misses to push stop
Change-Id: I23e2ea40c001197e82aa7ea4fb0dad86670a4954
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-12 13:32:37 +02:00
Eike Ziller
a699dc3c71 Version bump
Change-Id: Ie3e9647c3a627feb42392d3a965b67edd0f48b6c
2013-07-12 10:01:36 +02:00
Orgad Shaneh
cf793dc63d MakeParser: Do not show "Warning" as error
Change-Id: I61e6dd689d8f24402f6ac5bb0fb109ecc1a26831
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 18:04:23 +02:00
Robert Loehning
756222f28e Squish: Expand tests to python editor
Change-Id: I1c3062f2802531d7a6e2f3c2b75645432ba364a4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-11 16:59:07 +02:00
Christian Stenger
2c1bb666c3 Squish: Disable tst_qml_locals if OpenGL is missing
VMs used for testing need some adjustment to support QtQuick2 related
stuff. (OpenGL must be usable.)

Change-Id: Icc9b32cd2ad961f328f518276210969d704ad461
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-11 16:06:00 +02:00
Orgad Shaneh
457b5e2969 Git: Prevent double stash pop on branch checkout
when Move Local Changes is selected

Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-11 12:52:06 +02:00
Orgad Shaneh
d31efc22e8 VCS: Stop on file pattern when building a chunk
Task-number: QTCREATORBUG-9782
Change-Id: I0e50c5c2696ad9cfe4e8a56c28cb17a2ee039b4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 12:50:40 +02:00
Aurindam Jana
9e8cd1eb1f QmlConsole: Check for duplicate children
When constructing the console item tree, check for
duplicate entries.

Change-Id: Ibc5aa150287ef5e2ee4b691a71bb170308a1fde7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-07-11 10:54:17 +02:00
Aurindam Jana
fd685138c7 QmlConsole: Fix infinite recursion bug
The queried v8 object sometimes returns a child item that
refers to itself triggering an infinite recursion.

Task-number: QTCREATORBUG-9747
Change-Id: I30dfbb834ebeb39c33a6050d4b4860b1b47f34d9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-07-11 10:53:06 +02:00
Robert Loehning
415c4c7765 Squish: Catch possible exception in tst_CSUP01
Change-Id: I308922e4b2a2deaf9246b9614c1bc644a80613fe
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-11 10:10:56 +02:00
Robert Loehning
0df387e894 Squish: Exit tst_QMLS01 safely on failure
Change-Id: I6e31a3eabb062328fc5ddf34eb4bf2b8b06d36e3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-11 10:10:48 +02:00
Christian Stenger
97a6ee9685 Squish: Added test for checking locals
Change-Id: I8c676982d335c772a5911cab23a52acb2a094ed1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-11 09:16:20 +02:00
Victor Ostashevsky
8b390350df Ukrainian translation update for 2.8
Change-Id: Ieefff3b428a7bf45270ae80681d1b8b029bacfce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-10 14:40:58 +02:00
Eike Ziller
0873f27df7 Do not accumulate connections for updating external file warning
The project explorer was accumulating connects to editors' changed
signals (for editors on "external" files).

Change-Id: Ia961a76ca9b67429a682973bc68acd483d4cd127
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-10 14:38:53 +02:00
Tobias Hunger
d141af165f Kit: Handle device changes
Fix the updating of kits as devices are added/removed. This never
worked as intended due to the DeviceManager not sending the signals
I expected it to send, but masked by the Kits options page doing
the right thing for us.

Change-Id: I2d42ff7c1b8f6d795e20aebd114d723304904d4b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-10 14:36:28 +02:00
Orgad Shaneh
3eacb444e9 Git: Prevent another crash on checkout
Crash happens if the repository has a submodule with local
changes that requires updating (commit changed between current
branch and new branch)

Since we already refresh for every repo change, just add "expect"
for checkout and remove the code accessing the deleted index.

Change-Id: Ic464129a2f001e017244fdf719b282dcbd9dffa4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-10 12:51:06 +02:00
Fawzi Mohamed
372fc608df qmljs: add console.warn,...
Task-number: QTCREATORBUG-7033
Change-Id: I100cd6759534e5e94246f999481f5217f9e51b31
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-07-10 10:11:00 +02:00
Eike Ziller
e52383dbef Version bump
Change-Id: I0e90b8298bc053ca45db44ee107eba70465696d7
tqtc/v2.8.0 v2.8.0
2013-07-10 09:11:02 +02:00
Friedemann Kleint
4f4fe8f3ec Fix build of Designer plugin against Qt 5 stable.
Change-Id: I53a6b49ff408c73d7532701a0b9eb5ed2c9aca6b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-10 08:58:27 +02:00
Nikolai Kosjar
20f3502754 C++: Introduce caches to Clone* classes
Done-with: Erik Verbruggen <erik.verbruggen@digia.com>
Task-number: QTCREATORBUG-8747

Change-Id: I7cb694f8180c6aa932b07066d98d095340111324
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: xSacha
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 18:31:14 +02:00
hjk
2a74ec4ffd Debugger: Don't use classnames as part of inames
They may contain spaces and other things confusing the
watchmodel.

Change-Id: I87932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 17:29:38 +02:00
hjk
4352aba86a Debugger: Make autotest work with LLDB 179.5
Change-Id: I9834330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 17:29:13 +02:00
Daniel Teske
553e6267e0 ProjectExplorer: Fix build dependencies
Task-number: QTCREATORBUG-9601

Change-Id: Iece4fd11a42ac1562f9f6a2186c278ad49ce8d7d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 16:29:32 +02:00
Christian Kandeler
f71bb6d348 Adapt qbs files to qbs.fileinfo renaming.
Also update qbs submodule so Creator can open itself.

Change-Id: Iaa70d5e83d07a1120e795046ebbd8995159aa2db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 16:21:24 +02:00
hjk
fe296e2b25 Debugger: Disable build-in LLDB formatters for old LLDB
This is kind of hot fix to solve conflicts with Creator's
pretty printing in the LLDB 179.5 context which does not
seem to handle SBValue.SetPreferSyntheticValue.

Change-Id: I9837bd3044a9ec90c67de3060d5895ae0b6b8653
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 15:16:43 +02:00