feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Koehne
e2e0db687e QmlProject: Fix debugging with C++ language 
Because no ABI was specified, gdb bailed out with 'File format not
recognized'. Instead just use the ABI from one of the toolchains
available for the Qt version (assuming that they're all compatible).

Task-number: QTCREATORBUG-5957
Change-Id: I7db9bd45c6a015c6236ae1b672909e013fad1d65
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-01 12:51:45 +02:00
Shane Bradley
049db19d84 qttest: Fix updating test view when changes happen in Projects 
Change-Id: I9ee4ca7643ffd04dbf466412c71ec5471de1eb1c
Reviewed-on: http://codereview.qt.nokia.com/3904
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-01 12:32:34 +02:00
Christian Kamm
f9a0993815 QmlJS: Introduce chunk-wise result reporting in semantic highlighter. 
Change-Id: I18fcea6c548bb0610db196b4aead8c4d52b40171
Reviewed-on: http://codereview.qt.nokia.com/4043
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-01 12:23:10 +02:00
Christian Kamm
ed8a7fc87c C++: Clean up semantic highlighter chunking code. 
Change-Id: I5398442bdb864c4bccd8c193364bed3879bbc660
Reviewed-on: http://codereview.qt.nokia.com/4042
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-01 11:27:55 +02:00
Eike Ziller
81f93c1d40 Version bump 
Change-Id: I9ef0aa6d47dca86fdd3169a40b9642c898607a05
 2011-09-01 10:50:52 +02:00
hjk
2bda418478 debugger: robustify QFile* dumpers 
Change-Id: Ic5ec62a484b2d7c71664e86b7f1f38c582492811
Reviewed-on: http://codereview.qt.nokia.com/4051
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-01 10:29:00 +02:00
Christian Kamm
688595e7ba C++ function link: Don't add name if name is commented. 
Change-Id: Ibc38898585f6e5be625ccfc0e1304ccb44a7f167
Reviewed-on: http://codereview.qt.nokia.com/3955
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-01 09:25:24 +02:00
Christian Kamm
2da3219909 qmlpuppet: Fix build with Qt 4.7.4. 
Change-Id: I74f0784d76f8fa7137db22a251deaab9d99481dd
Reviewed-on: http://codereview.qt.nokia.com/4040
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-01 09:23:30 +02:00
Shane Bradley
f1298e85ed qttest: Disable default load of plugin til parsing times are improved 
Change-Id: Ib29cae27ec9666d31df571a9c87dfc2a24644f09
Reviewed-on: http://codereview.qt.nokia.com/4020
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-09-01 09:09:02 +02:00
Kai Koehne
1bca3e966d QmlJSDebugger: Merge back changes done to the files in qtdeclarative 
Change-Id: I722b191035757c60ce103edf74517f5348a91955
Reviewed-on: http://codereview.qt.nokia.com/3945
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-01 08:53:39 +02:00
Marco Bubke
7fa9e52d70 QmlDesigner.NodeInstances: Create effect items only in the render process 
Change-Id: I0506bf898582ba8e26a22f51737eae4d82f06c63
Reviewed-on: http://codereview.qt.nokia.com/4004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:50:04 +02:00
Marco Bubke
d9b10dca48 QmlDesigner.NodeInstances: Fix header 
Change-Id: Ib272d772f6e8838b71c6ede8222acae4313ecae2
Reviewed-on: http://codereview.qt.nokia.com/4009
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:52 +02:00
Marco Bubke
f6f6045153 QmlDesigner.NodeInstances: Fix frame dropping for last frame 
Change-Id: Ie8c66c55f0236043441043727f31c9040a5dfc3d
Reviewed-on: http://codereview.qt.nokia.com/4008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:46 +02:00
Marco Bubke
3937a20f18 QmlDesigner.NodeInstances: Fix frame dropping for last frame 
Change-Id: Id70b1bc0af09293628fe2242f4bebeb30c1ae230
Reviewed-on: http://codereview.qt.nokia.com/4007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:39 +02:00
Marco Bubke
c13624fb2f QmlDesigner.NodeInstances: Preview images for Qml2 
Change-Id: I00ba96458ab8cb2e9d9766e1ecfeaea15bf2e040
Reviewed-on: http://codereview.qt.nokia.com/4006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:32 +02:00
Marco Bubke
cafc2a6c84 QmlDesigner.NodeInstances: Add sgitem getter to the server node instance 
Change-Id: I58baee2a8e59f2cef8add0472a3ee0c2a13fd59a
Reviewed-on: http://codereview.qt.nokia.com/4005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:26 +02:00
Marco Bubke
432a36283f QmlDesigner.NodeInstances: Use v8 private headers 
Change-Id: I4c0d8e08a22ee0c5b2602cc7d877071010fd9f88
Reviewed-on: http://codereview.qt.nokia.com/3976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:18 +02:00
Marco Bubke
abc3a9b716 QmlDesigner.NodeInstances: Provide bounding rectangle for render image 
Change-Id: If1d8e51109eec5e281a1cecdaff7c081a5e6d95d
Reviewed-on: http://codereview.qt.nokia.com/3975
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:12 +02:00
Marco Bubke
bb0900d668 QmlDesigner.NodeInstances: Refactoring dirty to isDirty 
Change-Id: I6344632a8570ad09e38c7d3dc093c42d758bf15a
Reviewed-on: http://codereview.qt.nokia.com/3974
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:06 +02:00
Marco Bubke
1e60fbfba4 QmlDesigner.NodeInstances: Add support for new list interface 
Change-Id: Icd20f2a921c94f8bac73f9f61b61a34561ee2d3f
Reviewed-on: http://codereview.qt.nokia.com/3973
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:01 +02:00
Marco Bubke
9250b611c8 QmlDesigner.NodeInstances: Fix image rendering 
Call DesignerSupport::updateDirtyNode() recursively for every item which is
not under our control.

Change-Id: Ie6c784965d1557ece81176fc405864f1328733f7
Reviewed-on: http://codereview.qt.nokia.com/3972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:55 +02:00
Marco Bubke
50d1087a94 QmlDesinger.NodeInstances: Fix bounding rectangle calculation 
Change-Id: Ia0633416e50da68377a781050e301e5721540d6b
Reviewed-on: http://codereview.qt.nokia.com/3971
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:49 +02:00
Marco Bubke
1e1e4b4f70 QmlDesigner.NodeInstances: Fix function call to parent class 
Change-Id: I4842b91c53b3d9f0b0bc6a950858ce482b173d1b
Reviewed-on: http://codereview.qt.nokia.com/3970
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:42 +02:00
Marco Bubke
b8592f1b98 QmlDesigner.NodeInstances: Remove unused code 
Change-Id: Ibf585ef6f821f73be16888fea550bfe0e0b1bcd6
Reviewed-on: http://codereview.qt.nokia.com/3969
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:36 +02:00
Marco Bubke
ebf7c68705 QmlDesigner.NodeInstances: Remove Qt5 guards 
Change-Id: Ia740b2818dcc287ff82991ae317bcf644c4c0c2a
Reviewed-on: http://codereview.qt.nokia.com/3968
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:23 +02:00
Marco Bubke
991e75d65b QmlDesigner.NodeInstances: Improve SceneGraph support 
Change-Id: Ia5111f972836a1123fe857511325a82aef855449
Reviewed-on: http://codereview.qt.nokia.com/3967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:04 +02:00
Tobias Hunger
60ccecd7af ABI: Add one more unit test 
Change-Id: I1037473a1027a10213151046aedea0e61ff278a3
Reviewed-on: http://codereview.qt.nokia.com/4001
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-31 18:01:51 +02:00
Tobias Hunger
457b667dd6 ABI: fix endian issues 
Fix possible endian issues when detecting the ABIs.

Change-Id: I23e29a9bc697f63eb17641540083b34c6059096b
Reviewed-on: http://codereview.qt.nokia.com/4000
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-31 18:00:58 +02:00
Tobias Hunger
109190b3b5 ABI: Improve detection of Windows PE 
Thanks to Thiago for pointing out the MZ header which points to the
PE header.

Change-Id: I87bcedf368483d60756e1c9b665ffe3a80c47736
Reviewed-on: http://codereview.qt.nokia.com/3998
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-31 18:00:38 +02:00
Tobias Hunger
c6295f62cd GCC: Add unit test for dumpmachine parsing 
Change-Id: I9be657018f0cb98b0acb8d6139389ab61ebab070
Reviewed-on: http://codereview.qt.nokia.com/4002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-31 17:49:46 +02:00
Tobias Hunger
eacb2e7263 Fix warning 
Do not hide symbols of base class

Change-Id: If35d662b0ce3680b0a46e47d55564d46c8740625
Reviewed-on: http://codereview.qt.nokia.com/3999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-31 17:48:45 +02:00
Tobias Hunger
f44c9e26ed Fix typo in enum name 
Change-Id: I5de645197318062f2174e0205bfffc98413f911e
Reviewed-on: http://codereview.qt.nokia.com/3997
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-31 17:26:56 +02:00
hjk
188156977c debugger: prepare support for partial register display 
Change-Id: I74e971cfb41afbdd07f4193c14c3bb7ecd634859
Reviewed-on: http://codereview.qt.nokia.com/3990
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-31 16:51:54 +02:00
hjk
5d82ba7d87 modeltest: improve debuggability by simpler expressions in asserts 
Change-Id: I48286b73510bcbd303eedead69566d8bb776fe42
Reviewed-on: http://codereview.qt.nokia.com/3989
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-31 16:51:43 +02:00
Christian Stenger
991e19b40b Refactoring build functions, enhancing signal handlers 
Added functionality to remove the need to clean settings by yourself

Change-Id: If2d95618d5e77e30480d0ca763ad7ce632f2d094
Reviewed-on: http://codereview.qt.nokia.com/3984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-31 16:37:00 +02:00
Bill King
507d260bd4 Fixes openProject, also tests multiple target selection and building. 
Change-Id: I4a5aaea2eca940c3ffcf8458b5cc0afce591b63e
Reviewed-on: http://codereview.qt.nokia.com/3886
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-08-31 14:09:38 +02:00
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h 
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-08-31 13:48:00 +02:00
hjk
b6835eaa80 dumpers: fix two regressions in std::string and general pointer checking 
Change-Id: I971ff4ad425e291c3536bc25ae6ee4933e46a681
Reviewed-on: http://codereview.qt.nokia.com/3957
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-31 13:46:05 +02:00
Daniel Teske
fb80782577 Reduce the directories plugins are searched in 
Don't search in the mac directories on linux/unix and vice versa.
Orginal patch by Ray Donnelly <mingw.android@laptop.com> on the android
branch.

Change-Id: I57a4d83a94f28bbe00609fd1b9170629da27334e
Reviewed-on: http://codereview.qt.nokia.com/3949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-31 13:38:10 +02:00
Daniel Teske
56bf68422b Export Qt4ProjectManagerPlugin::MakeStep 
Fixes the wrong exporting in a838d4ac01

Change-Id: I3a56510f6821dd621a099d0345882264527e1059
Reviewed-on: http://codereview.qt.nokia.com/3948
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-08-31 13:10:06 +02:00
Leandro Melo
f235f2594b C++: Export DiagnosticMessage 
This is now necessary due to the recent change
that added the non-inline operator==.

Change-Id: I62255ddeb09f1e312a802db9733575e73ea56478
Reviewed-on: http://codereview.qt.nokia.com/3928
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-31 11:52:57 +02:00
Shane Bradley
d7ac11ea51 qttest: Invalid information shown in test output field 
Change-Id: I58d8702b0440566f67074e51a8c4ab74e74b8a48
Reviewed-on: http://codereview.qt.nokia.com/3905
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-31 11:48:12 +02:00
Christian Kamm
9f7a2194f7 QmlJS: Fix infinite loop when scanning for exported C++ types. 
Setting extra diagnostics would call updateDocument which would in turn
trigger another scan.

Change-Id: I3810a380cdf716a12767d94ff82dc30f8ae3954d
Reviewed-on: http://codereview.qt.nokia.com/3917
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-31 10:53:21 +02:00
Christian Kamm
7bc8dd18a3 QmlJS: Ensure the C++ model manager is available before using it. 
Change-Id: I0cc4e59505a6a5baa585e3748fdf174805d661b1
Reviewed-on: http://codereview.qt.nokia.com/3913
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-31 09:23:18 +02:00
Robert Loehning
0e784e8178 Avoid warnings from MSVC 2008 
Change-Id: Id8f75c19c8a6609e74900a71013c2fbbdbb3669a
Reviewed-on: http://codereview.qt.nokia.com/3677
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Bradley <shane.bradley@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-31 08:10:22 +02:00
Christian Kamm
9f1c294dd4 C++ preprocessor: Fix multiline tokens in ifdef'ed out blocks. 
Change-Id: If6f9819565f891e861f9e111423d99caa7c0f7aa
Reviewed-on: http://codereview.qt.nokia.com/3884
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-31 07:41:32 +02:00
hjk
6e877ec8ab utils: make QTC_ASSERT output compatible with outputpane parser 
Change-Id: Icdb423ec16b06538446aac4d248726dae8af97f1
Reviewed-on: http://codereview.qt.nokia.com/3874
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-30 16:02:17 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
 2011-08-30 15:59:07 +02:00
Christian Kamm
90a7786dde QmlJS: Change default semantic highlighting colors. 
Done-with: Carsten Owerfeldt

Change-Id: I4705a4e35bd0bbd73200332d86854dbd34cb70c4
Reviewed-on: http://codereview.qt.nokia.com/3877
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-30 14:52:52 +02:00
Christian Kamm
2c7a1104fa C++ semantic highlighting: Report uses sorted by line. 
This moves sorting from the gui thread to the future and
allows the incremental application of the extra formats
to assume chunks are sorted.

Change-Id: I38e179e573c43cc955cce820f17ac87e3300a839
Reviewed-on: http://codereview.qt.nokia.com/3869
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-08-30 14:50:52 +02:00