Commit Graph

50929 Commits

Author SHA1 Message Date
Vikas Pachdha
30a8e05a00 iOS: Do not boot a simulator in Booted state
It results into a simulator window with an error

Change-Id: I47d55082bf248fc6558e995158b631d75adb8617
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-16 09:23:17 +00:00
Nikolai Kosjar
96010fb8d3 ClangStaticAnalyzer: Remove -fPIC workaround
The option -fPIC predefines the macros __pic__ and __PIC__ and it was
added just to have these macros and thus avoid a parse error somewhere
in qglobal.h.

Nowadays we get these macros from the project/toolchain, so remove this
workaround.

Change-Id: Ib6106cf217f7d8a08da6f7dde435bcadd04b6ba8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-16 09:07:54 +00:00
Christian Stenger
3d6b108971 AutoTest: Fix handling of subtyping TestCase again
We need a more present snapshot when inspecting the AST of QML files
we need to process.
Due to handling all problematic accesses inside the QmlJS model by
guarding it with mutexes it is no problem even when parsing multi threaded.
The former fix collided with another patch and therefore went in
without fixing the issue.

Task-number: QTCREATORBUG-17787
Change-Id: I460bae4b09cdc9a0cd38bc3383fd593c3abdfaad
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-16 08:02:48 +00:00
Robert Loehning
5c3fce7f97 QmlJS: Fix version detection in updateProjectInfo
Change-Id: Ib8b53e8fdf5e69caf843a34390e820e9221a8be5
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-15 18:43:16 +00:00
hjk
408e384e9b ProjectWizardPage: Simplify tree walking
Change-Id: I74eb980a762b6a880ec40a359afb6b36a6bab419
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-15 16:57:15 +00:00
Ulf Hermann
53a32f7fc6 ScxmlEditor: Don't generate invalid state names
'(' and ')' should be avoided when copy/pasting states.

Change-Id: Ic54528ed51b2f4596651bb1d23f282e70210f3a7
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-15 16:51:18 +00:00
Ulf Hermann
7236f2124a Qml Debugger: Set detailed options rather than "sanity"
The v4 debug service doesn't understand "sanity" after all, but wants
to know the features we support. So state that we don't need redundant
references and that we understand names when sent as strings.

Change-Id: Ie973dd8002935a113a367d098337983d61663265
Reviewed-by: hjk <hjk@qt.io>
2017-03-15 13:10:32 +00:00
Orgad Shaneh
8457949dbc Debugger: Fix MSVC warning
Implicit cast from size_t to int.

Change-Id: I8e53a6511afa4a3435f571217d736725771fef9c
Reviewed-by: hjk <hjk@qt.io>
2017-03-15 12:18:36 +00:00
hjk
61501042bc Debugger: Simplify Qt namespace guessing code
We get proper notification when QtCore is loaded now, and we either
got it, or not.

Change-Id: I9485126d9b15b8d859ba440f3ba1623f03527ef8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-15 11:36:18 +00:00
hjk
68a4a3db94 Debugger: Use gdb provided hooks to track loaded shared objects
Change-Id: I4f3cce56910e0e737febaf0ff442956b78b19c30
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-15 11:34:58 +00:00
Tobias Hunger
802eff3485 CppTools: Add target information to ProjectPart
This is important to be able to map sources to actual things that are
going to be built.

Change-Id: I1aef940767d60192642ed79a1703cff8dfdad9e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-15 11:03:45 +00:00
Tobias Hunger
831864c56c ProjectExplorer: Report VCS topics in all cases
Report VCS topics when the top level project node is a file or
a directory.

Task-number: QTCREATORBUG-17498
Change-Id: Ie20109b228afc79bfc2ac21505a8798d9fd5efd6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-15 10:28:23 +00:00
Orgad Shaneh
181766c41d Qmake: Fix "Build File" for sub-projects in pri
For example, locatorwidget.cpp which is in locator.pri under
coreplugin.pro.

Change-Id: I93e6d06ad19b14280c6c3c9e701c64dca3a51856
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-15 10:28:09 +00:00
Orgad Shaneh
423cca3521 Qmake: Fix "Build File" for initial opened file
If a session contains an open file, when Qt Creator loads this session on
startup, Build File is invisible, and doesn't work.

Change-Id: Icbc918a4b74f6293d100c04bae0a070d99ce7196
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-15 10:28:06 +00:00
Tobias Hunger
1621aaa26e CMake: Fix some more SOFT-ASSERTS in CMake server-mode
Fix two more SOFT-ASSERTs in CMake server-mode that could be triggered
by complex projects.

Move and simplify search functionality into FolderNode and use that instead
of hand-crafting a custom tree search in CMake.

Change-Id: If4bde5c4a7ff84c7d5dba4f595e99b39f54ac8aa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:23:14 +00:00
Tobias Hunger
6e91fe5046 CMake: Use a CMakeProjectNode as top level cmake node
Change-Id: I6e68b971cf490b9b064a2866bd99865a7f4a7bd9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:23:09 +00:00
Tobias Hunger
b8417e0f0c CMake: Fix projects with complex CMakeLists.txt layouts
This fixes soft assserts in e.g. Musescore.

Change-Id: I860c8c184161e53918fb901d66b89cffb0c09e23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:22:24 +00:00
Thomas Hartmann
b3238d5736 QmlDesigner: Fix nodeAtTextCursorPositionRekursive()
If the length is -1 then the document is invalid and we should
return an invalid model node.

Change-Id: Id2a329a16617f862a518a3c1f00f9078697d72d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:15:38 +00:00
Thomas Hartmann
73f8308959 QmlDesigner: Only change selection if required
This avoids sending selection changed notifications.

Change-Id: I2303941f388495e98171ef40dce2ee12739f7dcd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:15:21 +00:00
Thomas Hartmann
5e43e6c6ae QmlDesigner: Disable QML compiler for tests
Change-Id: Ia0c9a0241b5c2dd11a3a0c0f667adcdef9706191
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:15:06 +00:00
hjk
df73d57295 QmlProject: Simplify interface a bit
Remove unneeded code and don't repeately fetch a singleton value.

Change-Id: I718a44c28be7ef8718f813f987f45b32cbcd7ad5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 06:57:31 +00:00
Orgad Shaneh
5d1e12faad iOS: Fix compilation
Change-Id: Ieb5357a25240a64c4461325cc7165b68df3e71b9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-03-14 19:49:11 +00:00
Vikas Pachdha
f80808f5e9 iOS: Let user specify developer team and provisioning profile
Task-number: QTCREATORBUG-16936
Change-Id: Ie4a91125f34fbf35cda4e1593919899af5f4cdbb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 17:16:11 +00:00
Vikas Pachdha
7c95aedfd3 iOS: Add API's to get provisioning data
Change-Id: I927b2dbaa9e6c175d90b1407418570bbd2a3d96e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 17:15:57 +00:00
Tobias Hunger
6f0a31166d ToolChains: Write compatibility information for QtC 4.2
This avoids turning all toolchains into C++ when going from Qt Creator 4.3
to Qt Creator 4.2 and back.

Change-Id: I607606f76d958c634ab27cb6db3bf35a1236b2b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 15:56:03 +00:00
Vikas Pachdha
7136162047 add extra arguments for qmake
unlike user arguments, extra arguments are not user editable

Change-Id: I0413c2da699c6d2fce1db10a8bc3dd938c8477b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 15:51:31 +00:00
Orgad Shaneh
5b9eaf747d QbsPM: Add nodes incrementally
Change-Id: Id53a0107df64b26d8ec57eda734635bda9e045f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 15:51:12 +00:00
Tobias Hunger
6815633dff Qbs: Fix build after update to ProjectNodes
Change-Id: Ibb736901596a7295f50059f5dd448a2b5da32e85
Reviewed-by: hjk <hjk@qt.io>
2017-03-14 15:25:00 +00:00
Orgad Shaneh
9804d56009 Nim: Add an explicit include for QRegExp
Other includes will be merged from 4.2. Nim doesn't exist there.

Change-Id: I0d701a07adefe04e730898a219be021ec4e70860
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 14:42:19 +00:00
Orgad Shaneh
cf93b4cc03 Merge "Merge remote-tracking branch 'origin/4.2' into 4.3" into 4.3 2017-03-14 14:42:07 +00:00
Robert Loehning
2d703c7dd4 qmljs/parser: Remove check for impossible value
Change-Id: Ide23dd761016a37ef4720c7637818e20925df7d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 14:25:53 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
2017-03-14 16:20:14 +02:00
Tobias Hunger
2e54c89738 GccToolChain: Remove autodetection for gcc-4.0 and 4.2 on macOS
Change-Id: I64f9533a153d6a2577747f31a422f91ff555351e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 13:34:19 +00:00
Robert Loehning
629dd8bbed Squish: Update expexted log in tst_git_clone
Change-Id: Ie0f87cf23d9c86c6e5ada37be00cf8e7c2c8ecb5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-14 13:11:07 +00:00
David Schulz
e41befd4f7 Debugger: Check also for Qt5Core(d).dll on Windows
Change-Id: Ic078a165d35c316cb12d08ca84913b4b07143aa4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-03-14 13:07:23 +00:00
Orgad Shaneh
11e8ce65db Gerrit: Force remote refreshing on 401 error
Can happen if the password was changed.

Change-Id: If0f0fa047c376c193ceda50e5465d016e16b61a3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 13:02:40 +00:00
Orgad Shaneh
75273506c1 Gerrit: Resolve also user name from gerrit response
If gerrit provides it (version >= 2.10).

Change-Id: I7087be338e954fa13eb4a9fcc4f848d6272a46d6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:35 +00:00
Orgad Shaneh
8795ec0beb Gerrit: Replace single line slots with lambdas
Change-Id: I63c3e963a2aa04043c4da3da6313757b001f568d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:15 +00:00
Orgad Shaneh
db16f265c9 Gerrit: Add a button for server revalidation
Change-Id: I0ef823aa562093e5e3d63bc2766ab1a95ae259d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-14 12:55:10 +00:00
Orgad Shaneh
c1d013437f Gerrit: Persist server details
Avoid repeating connection tests for the same server between runs.

Change-Id: Iecea52af986a708f317878c171d4fcea088cbbde
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:04 +00:00
hjk
a6a271881f ProjectExplorer: Inline FolderNode::recursiveFileNodes()
... into its only remaining user.

Change-Id: I5efa716ce34ba6a237dfcbcfebb257c863fdd21d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:33:47 +00:00
hjk
4d8352a6c1 ProjectExplorer: Add a FolderNode::addNestedNode() function
Also, rename buildTree() to addNestedNodes(), it's really
adding things, not recompletely (re-)building the subtree.

Use it whenever possible to avoid intermediate lists of items
to insert.

Change-Id: I5fde41e5b164a8a292410bd381a85f5efadf3471
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:26:22 +00:00
Tim Jenssen
7428aa9cec QmlDesigner: fix linking the tests
Change-Id: I8cf37aa48c05c0c67dc0c31373e8365584fb106c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-14 11:58:44 +00:00
Thomas Hartmann
116c92ba8d QmlDesigner: Fix warning
Change-Id: I77f2963957ec0679485e5582b79edd13a57beee9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-14 10:50:19 +00:00
hjk
30b4955ed7 ProjectExplorer: Add a SimpleRunControl implementation
Essentially a RunControl with and ApplicationLauncher member like it is
used directly or in disguise in the LocalApplicationRunControl, Nim and
Python. Extenting that to RemoteLinux/Qnx is possible, but left to the
next patch.

Change-Id: I91b3199d3d6a418fe4e5be7a5d61689c581a5121
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 10:35:37 +00:00
Thomas Hartmann
a116529177 QmlDesigner: Fix performance regression when selecting
The method nodeContainsCursor() is rather slow for huge documents
and we do not really have to call it. Checking if the selected node
does contain the cursor is enough and can be done in constant time.
Since we do this whenever the selection changes this fixes notable slowdown
in huge documents.

Change-Id: Ie525f0fbcacd6abb72f843f59a793c4f82190a0c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 10:31:06 +00:00
Thomas Hartmann
37c0176883 QmlDesigner: Fix nodeAtTextCursorPosition()
The old implementation assumes that the order of nodes
returned by directSubModelNodes() is the order in the QML\
text document. This is not always true if we mix different
node properties.
If we cannot rely on the sorting the algorithm becomes slow.

This fixes selection of delegate items in styles.
e.g.
Button {
   text: Text {
   }
   some children
}

The selection of the Text element did not work in all cases before.

Change-Id: Icf89bdcab4cb9d2a9fe395d1fbf4e961c09e10e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 10:30:54 +00:00
Orgad Shaneh
6f3892bf51 QmlDesigner: Fix tests compilation
Change-Id: I08f1abdfb19a04f83e01afd5917ee97e7d61f9cd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 09:11:25 +00:00
Eike Ziller
27cd6125c4 Merge remote-tracking branch 'origin/master' into 4.3
Change-Id: Icec79bee97b5f216c0caa2645cd27e7cb61ad77b
2017-03-14 10:06:35 +01:00
Christian Stenger
8a071a57bd AutoTest: Make some strings translatable
Change-Id: I9cbb3051d5b3d63116c086cbdcdb97992202298e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-14 08:24:21 +00:00