Commit Graph

27533 Commits

Author SHA1 Message Date
Thomas Hartmann
a6c8628c12 WelcomePage: add combox to filer Qt versions
Task-number: QTCREATORBUG-8377

Change-Id: I6693d4ed9cf3791e4cd791463a1b00a23dc4ffff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 14:08:37 +01:00
Thomas Hartmann
fa3b69d7a9 QmlProjectMamanger: ui fixes for QmlApplicationWizard
Adding Proper title and description.
Setting project name as uniqueProjectName() (untitled)

Task-number: QTCREATORBUG-8679
Task-number: QTCREATORBUG-8680
Change-Id: I29227dc45cc3584f5a57642d936cac5a458535af
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 13:55:37 +01:00
Christian Stenger
675b33e832 Squish: Let tst_rename_macros continue if it fails
Change-Id: If4836259220f6439e7f2cc958ecfb19b56c94573
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-04 13:55:08 +01:00
Orgad Shaneh
a9e3db2283 Project: Only add qbs file if it exists
Change-Id: I2d49644b63bad9b7ffa7d088f443ed6ec2fc85ed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-04 11:49:31 +01:00
BogDan Vatra
1ee3db88e3 Revert "Android: also adb pull /system/bin/linker"
It breaks the debugging on real devices.
Tested on HTC Desire HD and HTC Amaze.

This reverts commit 6fc9c0732b.

Change-Id: I378af345b186e1b4eef9997d3d8e592c43c3f1c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:27:20 +01:00
Yuchen Deng
86075a8f0e Get the correct CMake Version
Change-Id: Ie5443c31ecf8dd7644303f5e5a2f9885a33bf3a7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:25:08 +01:00
Yuchen Deng
bc1977d238 CMake: Select arguments text for easy editing
Change-Id: I416a35a773792a1aee17811c022820262eb7f23e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:24:04 +01:00
Tobias Nätterlund
8ea3c5a413 QNX: Remove the image wizard extension for BlackBerry wizards
The icon and splashscreens are easier to configure now, with
the bar descriptor editor in place.

Change-Id: Ieaf48a5eef880c709d77af8bfc7b9e3d467c0e1e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-04 10:24:38 +01:00
hjk
39e15a0efe Debugger: Work on dumper auto tests
Change-Id: I94a4ff9a2f76b1eb2aee83f4db827f7906d1e382
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 20:26:11 +01:00
hjk
cb1275fa33 Debugger: Work on dumper auto tests
Change-Id: I3df1faef35fec270094fdfbcb360216f516d0208
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 18:55:44 +01:00
Friedemann Kleint
339bc28dbb CDB: Dump Qt 5's QMap.
Rename the StdMapNode to RedBlackNode, remove STL-specifics
and pass parameters to the recursion, so that it can be shared
between std::map and Qt 5's QMap.

Change-Id: I0a53c9e8f593f79d35591aaeb7c74e76e22c2da5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 17:10:18 +01:00
Robert Loehning
fc9ed4960d Squish: Fixed tst_qml_editor
Change-Id: Ice53977c5d747d0e38943274e269c31c48bf14c3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-01 17:09:49 +01:00
hjk
7cb97f89f9 Debugger: Re-enable some tests for QVariant and geometry classes
Change-Id: Id8e0b46a7669fa2e7bb43687baa10ea951d9dc78
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 16:56:51 +01:00
Thomas Hartmann
b65a6cbbc6 QmlDesigner: fix compile
Change-Id: I1086d1ff75be5499af942145453db364c938cb92
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 16:10:48 +01:00
hjk
13f3a6a5a0 Debugger: Fix QDateTime dumper and auto test
Change-Id: I1e71fdda85d791f76b8300fd1301f08e6d1bab71
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 15:15:07 +01:00
hjk
b6ad8a0d91 Debugger: Make std:: type simplification accessible from test
Change-Id: I26d9f656dac454c4e4ba51cab9b2120d8138462c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-01 15:14:37 +01:00
Thomas Hartmann
a2727b512d QmlDesigner: removing outdated plugin
Change-Id: I0cebc278c377d2410a8fa59d04c054eb402e4c37
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:43:17 +01:00
Thomas Hartmann
0eec9518b8 QmlDesigner.QmlModelView: fixing createQmlItemNode() and imports
If the version is -1 -1 then we have a file/directory import.

Change-Id: If739f3eeddd649ae4efa5e8490f176f8542595e0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:38:36 +01:00
Thomas Hartmann
02f41a97aa QmlDesigner: resolve versions for file components
If file components belong to a library import we should
resolve the version info.

Change-Id: I632af5a69934163c964672612a6453898abe1608
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:38:22 +01:00
Thomas Hartmann
72d415019a QmlDesigner.Model: fix for directory imports
Direcotry imports do not have a version that needs to be checked.

Change-Id: I0ba2826927eb7ddeaaed402c75be03aedfaa2f4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:38:03 +01:00
Thomas Hartmann
5d7690cfea QmlDesigner.ItemLibrary: fix for directory imports
Change-Id: Iead5e80c5ec195b179b7f9af70fb9925e760593b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:37:50 +01:00
Thomas Hartmann
3d54df8861 QmlDesigner.Rewriter: fixing file imports for alias imports
Change-Id: I87070a0b8594770049109c0a4c27a014c2bafeec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:37:24 +01:00
Thomas Hartmann
44075e0d65 QmlDesigner: crash fix
There might be cycles in the prototype chain.
In this case the meta info is invalid.

setupPrototypes() now flags the meta info as
invalid in this case.

If not we risk a stack overflow when running the
parent chain (Which might have a cycle then.)

Task-number: QTCREATORBUG-8399
Change-Id: Ie9f6bfc39cdfd1365463a70e76081d53df33da7f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:34:32 +01:00
Thomas Hartmann
15d93a15dd QmlDesigner: build qml2puppet by default for Qt 5
qml2puppet and Qt Quick 2 support is now stable enough to be included
in the standard build.

Change-Id: I8c55cbc12df56cc1a8d00a956ee56bf3bf45d498
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-01 14:33:57 +01:00
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