Commit Graph

27509 Commits

Author SHA1 Message Date
Thomas Hartmann
76bf971cb9 QmlDesigner.PropertyEditor: fix resource urls
When checking for existence we have to convert the url back.

Change-Id: I74536ca88d95b0013239d5ba63db99568e41ab00
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:32:09 +01:00
Thomas Hartmann
6956eb1d84 QmlDesigner: crash fix
The subcomponent manager populates the item library.
This means the ItemLibraryView has to be properly
initialized before we call m_subComponentManager->update().

I added a helper function and call it from activateAutoSynchronization(),
after all views have been attached.

Change-Id: Ie802f93c7d0a76b42160d4a92e8448e900380b71
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:30:55 +01:00
Nikolai Kosjar
4da344c0bf C++: ast2png: Try parsing harder
Try to parse a declarator, if that fails an expression, if that fails,
...at last a TranslationUnit is tried. It is also possible to specify
which AST should be parsed.

This simplifies the code snippets we can pass to this tool.

Change-Id: Idbc1a8a6f1c5cf7e20d899f7a2e4263c7f9d33a6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-01 14:30:12 +01:00
El Mehdi Fekari
1a0bed277d QNX: Use QtQuick2ApplicationViewer for BB Quick 2 app templates
Change-Id: I7b5029856bcba23e89a5ff83a5ae62906d1dbbe1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-01 14:22:08 +01:00
El Mehdi Fekari
fe10c7aa1e QNX: Use QML_INSTALL_QML variable for BB Qt5 app templates
In Qt5 the qtquick modules/qtdeclarative plugins are installed in the qml folder

Change-Id: I023e479df529a5f69fb9898389a2f130da3af59b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-01 14:15:20 +01:00
Erik Verbruggen
6d2c71ca84 C++: fix semantic highlighting when multiple editors are visible.
Update an editor when it is visible, not only when it is the active
editor.

Change-Id: I972d7185e466355dba62f2f59144cfaad5f37778
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-02-01 14:11:11 +01:00
Nikolai Kosjar
f10b978f86 C++: Improve GetterSetter quick fix
- Prefix getter name with 'get' if there is a conflict between
  the getter name and the member variable name.
- When possible, use base name of member variable as setter parameter
  name instead of 'value'.
- Generate static getters/setters for static members.
- Fix case "class C { char *@s; };" - the quick fix was not offered for
  this particular cursor position (right after pointer sign).
- Fix case "class C { char c, *@s; };" - the quick fix was done for the
  wrong type (char instead of char *).
- Do not generate a setter for const member variables.
- Do not get triggered on member functions and arrays.
- Do not offer the quick fix if there is already a member with the
  getter or setter name we would generate.

Change-Id: I4530467518ea0bf6368e47eb32d5faafbf8cd928
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-01 14:01:47 +01:00
hjk
dc5a2d6b18 Debugger: consolidate WatchData manipulation in watchdata.{h,cpp}
Change-Id: I241d37793dfde9cfe8e4895039819e91297e6cba
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 13:57:47 +01:00
hjk
5b9ad2986d QNX: Rename provider from RIM to BlackBerry
Change-Id: Ied33893b59364913a801cc0a613852641ba53338
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 13:56:06 +01:00
Tobias Hunger
44c9cd8fe2 Qbs: Fix build
Change-Id: I284f814ac63eb489a6b0a39dce85008de742237a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-01 13:43:02 +01:00
Erik Verbruggen
87a78cddff C++: fix find/rename macro usages.
The replace button was not connected. Also made the search restarting
slightly more robust.

Change-Id: Iad7aea436749c0bda6ec4f58776e73b598a12a23
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-01 13:40:03 +01:00
Przemyslaw Gorszkowski
858cb6e348 C++: instantiate template with default argument
Fix code completion for instantiation of template with default argument

Change-Id: I57b0306cc4540400ae83724db6c8b6b1aa67c255
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-01 13:36:03 +01:00
Robert Loehning
2c7347b8ed Updated license headers
Change-Id: I3ff71d3a686453e92ba8724e75a1879f48653d11
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-01 13:30:48 +01:00
Daniel Teske
43cd2a61f9 FlatModel: Fix Node::setPath() and FolderNode::setDisplayName
Both can lead to a change in ordering. This adds the necessary
QAbstractItemModel signals that need to be emitted and the necessary
updates to the internal data structures.

Change-Id: I23824d839ddd4a615eb5bc3bdfe68ab42ed89a9e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-01 13:23:22 +01:00
Daniel Teske
0d6e20c6e9 ToolChainManager: Drop autoDetected toolchains that are no longer valid.
Improve isValid for GccToolChain and MsvcToolChain to make that sane.

Change-Id: If45cdb4e2666dd1a2ee16c01cb65427362ec29da
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-01 13:08:45 +01:00
Tobias Hunger
2cd5010a3f Qbs: Allow for tweaking of Qbs log level via environment
Set QBS_LOG_LEVEL to any number, the higher the more messages you
will get.

Change-Id: I6ae0d3a5bb94ad6865cd57d9ff381d36c8c8e95e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-01 13:04:45 +01:00
Tobias Hunger
5ed1f71529 Initial version of qbs plugin
Change-Id: I0e0ae07affccfeab167303bb976475649a630e65
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-01 13:03:36 +01:00
Christian Stenger
df1f7796ba Squish: Fix tst_SCOM05
Change-Id: I63b5266639a272ee94cc50978f87634f09ff4177
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-01 13:01:05 +01:00
hjk
54d662c2cd Debugger: Fix QDate and QTime dumper and auto test
Change-Id: Iaf4cee3099a6745c5ccc42362463ec5203f8bfb0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 12:33:29 +01:00
hjk
0ea26fae85 Debugger: Fix dumper auto test for QByteArray with non-ASCII contents
Change-Id: I358d9f69a0d8c090dd9c4766ab1792011f100ce5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 11:50:28 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-01 09:19:26 +01:00
Przemyslaw Gorszkowski
21500d54b7 C++: fix replacing dot(.) with arrow(->)
Fix replacing operator dot(.) with operator arrow(->)
for typedef pointer.

Task-number: QTCREATORBUG-8488
Change-Id: Ic4462bc437a4aa37adfed4fa50b32d9bc20fe194
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-01 09:16:15 +01:00
Christian Stenger
e9f219c335 Squish: Fix tst_QMLS04
Change-Id: I16e4873bf33433b2b87229506f300300faa9ef9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-01 09:02:22 +01:00
Robert Loehning
f71486fa4d Squish: Fixed tst_modify_readonly
Change-Id: I8cce1e72dceb1085cb42f2cfa2bf8a7db721c564
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-31 17:31:58 +01:00
Tobias Hunger
f20b92f913 ProjectNodes: Add line information and act on it
Also allow for the path to be set. Qbs can move products from one
file to the next, so that is needed there.

Change-Id: Iebaf3be40fdb0e5e462d45b00cf46d58f985a163
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 16:34:34 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Christian Stenger
893b3da55d Squish: Fix tst_WELP02
Change-Id: Ie45909e9967fdb1333da25bc85f93195374f44da
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-31 16:24:37 +01:00
hjk
4622aba79e Debugger: Fix triggering display of threadnames
This is a recent regression introduced by the delayed python dumper
initialization.

Task-number: QTCREATORBUG-8615
Change-Id: I3b5dbe5b04c68cf873e3a2597edc60fe2888b3c9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-31 16:20:47 +01:00
Christian Stenger
58c45ca766 Squish: Added test case for default settings
Change-Id: I669a4a464b966ef9cf5a89f38e95e142e3574a1c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-31 16:16:33 +01:00
Daniel Teske
0a02ce6ae2 KitManager: Enable KitInformations to be invisible for Kits
This was only possible in theory but not in pratice.

Change-Id: Ia5100569c371134e3cabacfcd76084c8763f5ecc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-31 16:14:31 +01:00
Andre Hartmann
61dc293628 BuildManager: Display elapsed time after build.
Task-number: QTCREATORBUG-8617
Change-Id: I2883e2528ea59673e7f6658021e7f5f88faa3fa4
Reviewed-by: Cristian Adam <cristian.adam@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 16:14:25 +01:00
Daniel Teske
35457f6f2e Fix crash on renaming files in generic project manager
Task-number: QTCREATORBUG-8638

Change-Id: Ie5b9c237459f4e6d503121331a51821cd812bee8
Reviewed-by: Matthias Blaicher <matthias@blaicher.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-31 16:08:05 +01:00
Friedemann Kleint
2970a036d8 CDB: Use maxStackDepth and implement reload full stack.
Task-number: QTCREATORBUG-7320

Change-Id: I78bf8cf63fa892f2a6771911333c246839439bf4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 16:07:56 +01:00
Robert Loehning
0a35cae99d Squish: Fixed tst_qml_indent
Change-Id: I9edd5410896401810b5106049832c36221b155d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-31 16:02:57 +01:00
Orgad Shaneh
05026c51bc Update and clean .gitignore
* Prepend / for directories expected to be in the root directory
* Append / (and remove trailing *) for entries which are expected
  to be directories
* Add some qmake-generated directories (.obj, .moc, .uic)
* Include all exe files in a single rule
* Add cpaster, sdktool and qtcreator_crash_handler
* Add all tests binaries

Change-Id: Ic8640cfe2222bc18a16bf18f96ba6733cf50eaa8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 15:56:53 +01:00
Friedemann Kleint
5a4cd737ba CDB: Use maxStringLength parameter from settings.
Change-Id: I0969bbbc39863e0981b5af81feced10d0fbbecac
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 15:49:24 +01:00
Friedemann Kleint
72421c18c1 CDB: Pass settings maxStringLength and maxStackDepth to extension.
Change-Id: I602aa3758817026c8b4cbda1cc9fa9eff95fc691
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 15:48:31 +01:00
Friedemann Kleint
9c96a5a971 Locator: Fix valgrind warning about uninitialized variable.
Change-Id: Ie46af65a76c8da847d0f8b12ca4d3e8f5beb61dc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-31 15:34:24 +01:00
Robert Loehning
6ebb71ab57 Squish: Fixed tst_simple_debug
Change-Id: I12053784d9d897525e29c40ea806f680577c6c09
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-31 14:27:27 +01:00
Robert Loehning
14839e8acc Squish: Fixed suite_CSUP
Change-Id: Iab9acd6124c70397a3eff0a697fc8df4b663cc1a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-31 13:34:01 +01:00
Daniel Teske
8f43fc1162 FlatModel: Fix crash in ::flags() on being called on session node.
That only happens in the current qt5 dev branch, but this is saner.

Task-number: QTCREATORBUG-8664

Change-Id: I024e07ec10e10c2ff3fe294b7a7ea17ce91ff532
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-31 12:48:18 +01:00
Tobias Hunger
54d0f91b94 Qt4BuildConfiguration: Allow for "Release" and "Debug" BCs
No longer require some text additional text.

Change-Id: I0bc1f64e6cbc9577cd4d79e04ce95b24a614ac7f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-31 12:17:03 +01:00
Orgad Shaneh
3db5b1d657 VCS: Remove unneeded local variable
Change-Id: I7dd97336a0de55d4f6c1880f5d0fc75223bf8efb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-31 12:17:01 +01:00
Tobias Hunger
99df376578 QtVersion: Add some helper methods to query details on a Qt version
Change-Id: I7b46889a5bda280730d4585f7dc726835684db39
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-31 12:01:41 +01:00
hjk
82ab15e403 Debugger: Avoid endless loop when setting breakpoint on functions
Change-Id: I3ead86ba50d1d68a46cdc58c06684b2ac8c091c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-31 11:59:15 +01:00
Fawzi Mohamed
174baf5ea1 qmljs: differnt language constants for the different qml flavors
Added separated qbs, qmltypes, QtQuick1, and QtQuick2
and "generic" Qml languages.
Cleaned up the mime types a bit, preparing for registered mime
types.

Change-Id: I0e484c93e003176cd659acc546baa6d024defa19
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-01-31 11:50:35 +01:00
hjk
a839a46d4f Debugger: Fix initialization of Dumper structure
Change-Id: Ib753cb421361abcfa1f55bc8a0d43e8aa2d43dfd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 11:25:31 +01:00
Robert Loehning
58e4a5fb5e Squish: Fixed opening of files
Change-Id: Ia96a4a000cac1dde0f660e5f58141a73c7625a1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-31 11:22:17 +01:00
hjk
5e5eb43d18 Debugger: move dumper initialization to separate method for re-use
Change-Id: I8eb6f67ee342c88bc0f1b15874e37e130fa719a1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 10:30:12 +01:00
Tobias Hunger
bd31e1e89c BuildSettings: Do not crash when there no widget is provided
Change-Id: Iceac2082e1939844da68bf4474dac632c0536ece
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-31 10:04:14 +01:00