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
Alessandro Portale
768c4ef082 Consistent names for AbstractGeneratedFileInfo::FileType keys 
Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0
Reviewed-on: http://codereview.qt-project.org/4828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-20 17:56:30 +02:00
Joerg Bornemann
5a76c4434e remove superfluous semicolon from test wizard's output 
Change-Id: Id7d5a448c520f3000f686389e50b781bed98b205
Reviewed-on: http://codereview.qt-project.org/1345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-09-20 17:51:56 +02:00
hjk
27438f60e4 add some example with statistics on the impact of using small classes 
Change-Id: I29c68ce88fef599091a84f8bdec54778e4d62b03
Reviewed-on: http://codereview.qt-project.org/5257
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 17:51:50 +02:00
Eike Ziller
0cea87f55b Move some settings pages. 
Reducing vertical size of preferences dialog, and moving languages
settings adjacent.

Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e
Reviewed-on: http://codereview.qt-project.org/5251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-20 17:36:49 +02:00
Marco Bubke
80c1e74abd QmlDesigner.NodeInstances: Change Assert in exit 
Change-Id: I9a19ab772db406b0b1e6f9b76b997dcee17bccbf
Reviewed-on: http://codereview.qt-project.org/5244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 17:06:49 +02:00
Kai Koehne
06a2a46f43 QmlDebugger: Also show status of QDeclarativeEngine client in log 
Fix QDeclarativeEngineDebug to use the same enum as the other clients.
Also, use objectName() to name the clients.

Change-Id: I826970bf248ce2f50c4bf66c1f58c0b9b56698b1
Reviewed-on: http://codereview.qt-project.org/5231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-20 16:13:54 +02:00
Kai Koehne
c412abf29f QMLDebugger: Unify status messages 
Use "QML Debugger" as in qmlengine.cpp . Also don't print a warning
if the status is 'unavailable' as this is the default first state
in ',block' mode.

Change-Id: I21d8285eabdb6a2ced87ddc865eae1704e843cd0
Reviewed-on: http://codereview.qt-project.org/5228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-20 16:13:48 +02:00
Kai Koehne
d23a1adc3c QmlProfiler: Show 'retry' message box when connect fails 
Show the same message box as in the debugger if connecting to
the port fails.

Change-Id: I5f101fa6e7fc6166ad37c88d046aafca24a4276f
Reviewed-on: http://codereview.qt-project.org/4891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-20 16:13:42 +02:00
Thomas Hartmann
94f95b4bcd QmlDesigner: code cleanup 
Change-Id: Id2ce92b7b1f6bc190c0ac4899c951b8f3cff9535
Reviewed-on: http://codereview.qt-project.org/5225
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-20 14:02:25 +02:00
Thomas Hartmann
a83aac5104 fix gcc warning 
Change-Id: I7bd2b2d8256efb5782c2c87920cd2ab9da60a227
Reviewed-on: http://codereview.qt-project.org/5235
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-20 14:02:13 +02:00
hjk
483dfb0898 debugger: handle Qt version 5.0.0 in manual tests 
Change-Id: I4027fb9723e7f3c33edc1b90b0e68c0e96ed92c3
Reviewed-on: http://codereview.qt-project.org/5237
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 13:56:06 +02:00
hjk
fcaa288036 debugger: fix compiler warning for not-yet-used enumeration value 
Change-Id: I6ad55fc24c957442ee0ec8735b754f86e32d2dfe
Reviewed-on: http://codereview.qt-project.org/5236
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 13:55:52 +02:00
Eike Ziller
28144129d0 New searches should use the expand all button setting. 
Change-Id: I7aea08c553a18f78b16e40a2685ffb5625e65617
Reviewed-on: http://codereview.qt-project.org/5229
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-09-20 13:55:12 +02:00
Marco Bubke
dfbdf28703 Add extension property to FileNameValidatingLineEdit 
Does nothing if extension is empty. The extension check is case
sensitive.

Change-Id: I58f89eb57d53146dae95e58d77cd8b47826b8f42
Reviewed-on: http://codereview.qt-project.org/5163
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-09-20 13:29:31 +02:00
Christian Kamm
71cbd765b2 RefactoringChanges: Fix problems with encodings. 
Task-number: QTCREATORBUG-6140
Change-Id: Iedbfca6987bffa2670df39f5f461690218f6da14
Reviewed-on: http://codereview.qt-project.org/5233
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-20 13:25:36 +02:00
Eike Ziller
7c7562f2a1 Reduce size of general debugger settings. 
Part of a series of commits reducing the (vertical) size of the
preferences dialog.

Task-number: QTCREATORBUG-3172
Change-Id: I649ef392a8fc0fb068cc2f683d58ef324981a1b5
Reviewed-on: http://codereview.qt-project.org/5232
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 13:22:18 +02:00
Christian Kamm
a225f7a0af QmlJS checks: Add tests and fix small bugs for 'unreachable'. 
Change-Id: Iaf9febc841130fa913fcc071ed0bf28ff9e0b63b
Reviewed-on: http://codereview.qt-project.org/5149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-20 13:21:03 +02:00
Eike Ziller
a4570dec9f Fix displayed file name when searching directory ending with '/'. 
Task-number: QTCREATORBUG-6119

Change-Id: I894da0f77e484fe0785ece8039f46233e05c5c91
Reviewed-on: http://codereview.qt-project.org/5063
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-09-20 12:01:51 +02:00
Eike Ziller
d52d4ccd93 Delete the watcher to free the qfuture and its resources. 
Change-Id: I4847c23e99aeabb99d3bb557b70a4985b3675b97
Reviewed-on: http://codereview.qt-project.org/5145
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-20 12:01:33 +02:00
Christian Kandeler
9b8b1ad3db Compile fix. 
Change-Id: I562441bee0deec56132cea2e6091e1c822442e02
Reviewed-on: http://codereview.qt-project.org/5220
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-20 11:13:32 +02:00
Thomas Hartmann
d72df1c9f0 compile fix 
Change-Id: I95ed9831d016bc967e99e934a09e0cb43054fdba
Reviewed-on: http://codereview.qt-project.org/5223
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 11:00:44 +02:00
Xiao Hongying
e67d0d1964 qttest: Cleanup includes and use forward declarations. 
Task-number: QTCREATORBUG-5932

Change-Id: Ia8ce39d4e5261331b929721f8875ec0e2fdfab29
Reviewed-on: http://codereview.qt-project.org/5054
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-20 10:26:33 +02:00
Kai Koehne
084f116e7c QmlJS: Remove qmlutils_p.h also from .pri file 
File got removed in 25f37732b0

Change-Id: Ia0acd2ddab76768ce960278bedf395b13f3d2512
Reviewed-on: http://codereview.qt-project.org/5207
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-20 10:03:55 +02:00
Thomas Hartmann
5adf7992e8 QmlDesigner: adding crumblePath 
Change-Id: Ic0d68b145398a161194d2a469e9a2f15fe0901d5
Reviewed-on: http://codereview.qt-project.org/4996
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:55:28 +02:00
Thomas Hartmann
b14bd3a589 QmlDesigner.designModeWidget: exposing DesignModeWidget 
This allows calling cut copy and paste and component managment
from the outside.

Change-Id: Ie784b243f522409e9e778ef0700ac9c2f64e43cd
Reviewed-on: http://codereview.qt-project.org/4994
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:55:18 +02:00
Thomas Hartmann
d39fb3d8ce QmlDesigner.designDocumentController: removing instance 
We use DesignModeWidget::curentDocumentController instead.

Change-Id: I9129a0611cfbc9997e5adb46597b8846463ef7ca
Reviewed-on: http://codereview.qt-project.org/4995
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:46:49 +02:00
Thomas Hartmann
5754c78b6d QmlDesigner.contextMenu: allowing layout and anchoring 
Change-Id: Ifbaff782826b413c508f96929222886da37325c5
Reviewed-on: http://codereview.qt-project.org/4986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:45:03 +02:00
Thomas Hartmann
bbcaae36ad QmlDesigner.formEditor: extending toolbox with crumblePath 
Change-Id: Ifcb1b53274f05f7c935c54a2fb4975319459ba9d
Reviewed-on: http://codereview.qt-project.org/4993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:44:29 +02:00
Thomas Hartmann
8e9da5f797 QmlDesigner.instances: support for auxiliaryData @NodeInstance 
This allows overwriting values in node instances only.

Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867
Reviewed-on: http://codereview.qt-project.org/4924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:42:42 +02:00
Christian Kandeler
6268665d71 RemoteLinux: Export two more classes. 
Change-Id: I8af5fe9dce3e65f549e48cdc6485545def8b33f2
Reviewed-on: http://codereview.qt-project.org/5194
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-20 08:41:35 +02:00
Christian Kamm
9898a5e094 C++: Fix bug in findMatchingDefinition. 
In strict mode, don't give up after the first Document with candidates.

Change-Id: I62ba59708a3501b31f79d979b1a85bede875eccb
Reviewed-on: http://codereview.qt-project.org/5142
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-20 07:24:37 +02:00
Kai Koehne
cccad7432d QmlProjectManager: Make sure project tree updates after in project file change 
Use FileManager instead of our own FileSystemWatcher, since this one only signals
the first file change (cause Qt Creator apparently removes the file and creates
a new one on each change).

Change-Id: Idacd545e41cd3ee29bfbc122526b9097039c65d0
Reviewed-on: http://codereview.qt-project.org/4975
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-19 17:01:53 +02:00
Thomas Hartmann
9a14220843 QmlDesigner: remove dead code 
Change-Id: I2f88af9ef449ee21e646dab7ca23b97836249764
Reviewed-on: http://codereview.qt-project.org/5128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-19 16:20:42 +02:00
Thomas Hartmann
1086e38770 QmlDesigner.formEditor: usablity fix 
Displaying the bounding Rectangle  makes no sense for small/thin items.

Change-Id: Ia30692e0cfa2641cfe3b4962a2f54f9eafe50201
Reviewed-on: http://codereview.qt-project.org/4984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-19 16:20:14 +02:00
Thomas Hartmann
04510ee264 QmlDesigner.model: bugfix for Qt Quick 2.0 
The item itself can have any version. we have to check for the version
of QtQuick.Item.

Change-Id: I57a992dd09491b7990318e208d98a9c4e0011e56
Reviewed-on: http://codereview.qt-project.org/4983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-19 16:20:03 +02:00
Orgad Shaneh
c20bc6abd1 Git: Added decoration to log and show 
Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-19 16:16:33 +02:00
Tobias Hunger
a323c0d9fb Git: Fix diff/show/blame editors coming to the foreground 
Make sure all the proper arguments are applied when bringing a git
diff/show/blame editor to the foreground.

Task-number: QTCREATORBUG-5176
Change-Id: I4ca603311335ac4e591ba38a690f1f3a27725e8f
Reviewed-on: http://codereview.qt-project.org/5157
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-19 16:09:04 +02:00
Leandro Melo
6ef01600f3 Find: Change a few accelerators 
Since the find widget is no longer a dialog, a few accelerators
"conflict" with others from the main menu and global Creator's.
This doesn't really stop them from working, but it would be better
to have different ones. The new values are not the most obvious
ones, but there's not too many options.

Task-number: QTCREATORBUG-6114
Change-Id: Idbc885abad9b78dad7685568a9524066dc075694
Reviewed-on: http://codereview.qt-project.org/5147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-19 15:55:20 +02:00
Eike Ziller
71512addb7 Merge remote-tracking branch 'origin/2.3' 2011-09-19 14:19:23 +02:00
Christian Kamm
0df9c1fa1b QmlJS: Use new Lexer::scanDirectives. 
Change-Id: Id9f4cd6a53dc0d3f4cf0a0b3c846eca0e48372fc
Reviewed-on: http://codereview.qt-project.org/5144
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-09-19 14:18:30 +02:00
Christian Kamm
25f37732b0 QmlJS: Update parser from Qt5. 
Change-Id: I26a5fb6a1eb99a777e4f1e01fb7b19e559c9bce7
Reviewed-on: http://codereview.qt-project.org/5143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-09-19 14:18:23 +02:00
Aurindam Jana
dbfae9fb28 QmlDebugger: Attach to QML Port: Fix errors 
Connect to user defined host and port. Increased maximum connection tries.

Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-19 13:56:08 +02:00
Christian Kamm
cf2e3f225e QmlJS: Fix highlighting of property types. 
Task-number: QTCREATORBUG-6127
Change-Id: Iae5cd6256b2f1e792c3c91eb5915e3f082753e6e
Reviewed-on: http://codereview.qt-project.org/5136
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:52 +02:00
Christian Kamm
4fdeeb3039 QmlJS: Fix enum completion with 'as' imports. 
Change-Id: Ifc229c23c14a6395c9d3e5f7ec76b9b04678787d
Reviewed-on: http://codereview.qt-project.org/5134
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:44 +02:00
Christian Kamm
3e090166e3 QmlDesigner: Add null checks. 
Change-Id: I8f12a5391ec20829422d8c6eab3d4d191527e70e
Reviewed-on: http://codereview.qt-project.org/5130
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:36 +02:00
Christian Kamm
6c925cf0fc QmlJS: Rework exported C++ type registry. 
The problem was that if you exported
A 1.0, A 1.1 and B 1.0 where A is the prototype of B
the code model had not enough information to know that, depending
on the import, B 1.0's prototype should be A 1.1 or A 1.0.

To solve this problem QmlObjectValues now store the import's version
as well as the local component version. In the example above B 1.0
would have import version 1.1 if the 1.1 module was imported and thus
be able to choose the right prototype.

Change-Id: I7ef33f12ca5a528c62b2a8240f4b5720b0ebd4c3
Reviewed-on: http://codereview.qt-project.org/5129
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:26 +02:00
Daniel Molkentin
793031c7ba Make Qt Installer Framework Update Notifier part of QtCreator. 
Always compile but never run it unless UPDATEINFO_DISABLE
is being set to 'false' via qmake or environment.

Change-Id: Ie53fb2ea99bfebac1b6f416939554f25a5e481a7
Reviewed-on: http://codereview.qt-project.org/4483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
 2011-09-19 13:51:53 +02:00
Christian Kandeler
ac2bc6f39a RemoteLinux: Take adavantage of new proParsingDone() signal. 
Change-Id: I81aada97401a1f100f5e6c8376c297c8f2f86688
Reviewed-on: http://codereview.qt-project.org/5141
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-19 13:49:20 +02:00
Daniel Teske
57fa668bcd Add Qt4Project::proParsingDone(), which is emitted after parsing 
Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9
Task-Nr: QTCREATORBUG-6056
Reviewed-on: http://codereview.qt-project.org/4665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-19 13:45:06 +02:00
hjk
4759d8cef4 debugger: fix a wrong sanity check in the dumpers 
Change-Id: Ie2dce425cf1204f22bb752bd400bc98211b45a63
Reviewed-on: http://codereview.qt-project.org/5126
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:39:24 +02:00