summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Android: Fix C++ debuggingv4.3.0-rc1Vikas Pachdha2017-05-083-1/+58
| | | | | | | | | | Target Async mode enabled only for ndk version > 11 Task-number: QTCREATORBUG-18111 Change-Id: I218b6c23c1da13091f0035193a43e6117748055a Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QbsProjectManager: Fix object files appearing in locatorChristian Kandeler2017-05-082-3/+18
| | | | | | | | This bug got re-introduced by commit fc5ce1e710. Task-number: QTCREATORBUG-17382 Change-Id: I6114ca8f4305b3c0e356f4849094ecb1ccca7601 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectNodes: Fix crash in FolderNode::addFileFilter()Tobias Hunger2017-05-081-1/+2
| | | | | | Task-number: QTCREATORBUG-18160 Change-Id: I1b8fe9f949ca9aa04858321317ebb13eb01236ab Reviewed-by: hjk <hjk@qt.io>
* Squish: Increase timeout for cloning in tst_git_cloneRobert Loehning2017-05-081-1/+1
| | | | | Change-Id: Ib894ae05e8049331115ee34514d7638815408065 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Update tst_git_localRobert Loehning2017-05-081-2/+2
| | | | | | | Format of .pro file changed slightly Change-Id: I026057ecc76c082ddac06e81b36c0b3b62629da0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix ugly paint glitchThomas Hartmann2017-05-081-2/+9
| | | | | | | | | | The text inline editing has an ugly cursor rendering glitch with Qt 5.8. When we render the widget "manually" using grab then things seem to be ok. Change-Id: Idd00044de783164ca4ec021ae4c7b9f15302c2cb Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Describe Move Component Into Separate File dialogLeena Miettinen2017-05-083-6/+11
| | | | | | | | | | | This refactoring action can now be performed from the Form Editor of Qt Quick Designer. It opens a dialog for specifying which properties should be set in the original component and which in the new one. Change-Id: Ic076ddc2748a5da38c746b64eac943ec5adbbbf5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Doc: Add a link to the Qt Quick Controls 2 - Flat Style exampleLeena Miettinen2017-05-081-0/+3
| | | | | Change-Id: I3e38759dddb83202d14e40d2392a3e796c799bfa Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Dumpers: Fix operator + for pointersOrgad Shaneh2017-05-083-1/+40
| | | | | | | Add an extensive unit test to prevent future regression. Change-Id: I38b74f9b4f5893285e9afff2ddecaaad106f4114 Reviewed-by: hjk <hjk@qt.io>
* Debugger: Instruct user to enable CDB support componentDavid Schulz2017-05-081-3/+5
| | | | | | | | | | | If the cdbextension can't be found in 4.3 it's most probably caused by an update of Qt Creator via Maintenance Tool. Instruct the user to enable the 'Qt Creator CDB Debugger Support' component via the missing cdbbextension message box. Change-Id: I1e71d89ca75049dc1a2aacbe2b17bebf910a0d91 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Fix AVD creationVikas Pachdha2017-05-051-1/+1
| | | | | | Task-number: QTCREATORBUG-18161 Change-Id: Ibe7f779d26c199a91634c5921556df67d7c5aada Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlDesigner: Use proper meta info for ItemThomas Hartmann2017-05-051-1/+6
| | | | | | | | | | The QML minor version does not always match the QtQuick.Item minor version. The wrong version leads to warnings/error messages later. Change-Id: I5d38c17da079d8309db4fd4044eb0be4e9093dae Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmake: Make resource file contents available againTobias Hunger2017-05-052-6/+7
| | | | | | | | | | The Qml code model needs the contents of resource files. This was done using QmakeVfs::readVirtualFile, which is not correct, since it does not read data from files on disk. So fix this mistake by using QmakeVfs::readFile instead. Task-number: QTCREATORBUG-18140 Change-Id: I25fd07d63ab02764bdf3fa705e2ff025d6831581 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* Update qbs submoduleChristian Kandeler2017-05-051-0/+0
| | | | | | | To HEAD of 1.8 branch. Change-Id: Iade1952749f9f6344d2a535a106c63282bfc5041 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Abi: Make MSVC2015 match MSVC2017Tobias Hunger2017-05-051-10/+22
| | | | | | | Task-number: QTCREATORBUG-17740 Change-Id: I846f2a6a3c9819975c5ded2a447f8a38a098aa6b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Doc: Update info about Qt Quick Controls 2 support and stylingLeena Miettinen2017-05-052-26/+24
| | | | | | | | | | | Replace duplicate information in the "Creating Screens" topic with a link that poinst to the new "Using Qt Quick Controls" section in the "Creating Components" topic. Add information about selecting styles on the toolbar. Change-Id: I6c79b8781c216355427920a38542017f0dbf9929 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* SSH: Fix DSA key creationChristian Kandeler2017-05-051-0/+2
| | | | | | | We forgot to fill the key size combo box for this type of key. Change-Id: I30cb1a7996d03c5eb139aa65f43810e1014472c7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* SSH: Catch std::exception rather than Botan-specific onesChristian Kandeler2017-05-059-19/+13
| | | | | | | | | | In particular, the existence of Botan::Exception wrongly suggests that it is the parent class of all Botan-specific exceptions. This assumption, combined with a different bug that will be fixed in a follow-up commit, caused a crash in the key generator. Change-Id: I0aafb761052d185051df217c9914010235a7c77b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Highlighter: Fix freezing highlighter for complex context switchesDavid Schulz2017-05-051-4/+11
| | | | | | | | | | | | Exclamation marks in context attributes are used to split the attribute into a number of orders and an identifier. This identifier is the context that have to be set after executing the orders. Ignoring this context identifier could lead to an endless loop if used inside a default context with a Rule that has set the lookAhead attribute. Task-number: QTCREATORBUG-14611 Change-Id: I5992fa47ed2e353cbf7882bc772fdbee8f7f41f1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Fix missing 'typename' prior to dependent typenameDavid Schulz2017-05-051-1/+1
| | | | | | Task-number: QTCREATORBUG-18142 Change-Id: I4545526c83f184c8b76a9aad928c91c36d34b6e3 Reviewed-by: hjk <hjk@qt.io>
* buildoutputparser: Install dummy themeChristian Kandeler2017-05-041-3/+17
| | | | | | | | ProjectExplorer::Task needs a theme these days Task-number: QTCREATORBUG-16335 Change-Id: I266d676ee1a17bacb32d5f014436a81cddd5dde9 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Add flag to check for designerThomas Hartmann2017-05-042-0/+7
| | | | | | | | | The property runningInDesigner can be checked to find out if a component is running in the designer. Change-Id: Ibf35daba4bb30c7d919b1ff149c92b348d7e8059 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Fix compile for Qt5.6Christian Stenger2017-05-041-4/+13
| | | | | Change-Id: I259dd516a9b28e34a256321e8ac754f4215205a7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Gerrit: Fix REST for Gerrit 2.14Orgad Shaneh2017-05-041-1/+2
| | | | | | | 2.14 sends JSON without leading closing parentheses. Change-Id: I51ec44124e6c3f64b3a76733329fe3ea329c60b0 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* iOSTool: Fix stopGdbServer invocationOrgad Shaneh2017-05-041-1/+1
| | | | | | | | This amends commit 86882018dd39205ba281d9edcd54008e0b9d4156. Task-number: QTCREATORBUG-18108 Change-Id: I7c984e2f3596fb79a6027fe85c11577b3d1acf2e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Improve Go To ComponentThomas Hartmann2017-05-041-5/+18
| | | | | | | | | | | This improves the signals present in "Go To Component" or "Add Signal Handler". For some controls we have to offer property changed signal handler as first options. We simply hard code properties which are likely to be handled. Change-Id: Ide26589534d6d058f1b60afcc6353c4f0340cb22 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectNodes: add listInProject() to NodeTobias Hunger2017-05-047-16/+40
| | | | | | | | | Add a setter/getter for listInProject to Node and make the project list all nodes with this property set in Project::files. Task-number: QTCREATORBUG-18132 Change-Id: I334e627856d1bc0d033e13c5d629f6657d8d7fee Reviewed-by: hjk <hjk@qt.io>
* ResourceTopLevelNode: Enable marking this node as generatedTobias Hunger2017-05-044-6/+10
| | | | | Change-Id: I298d405cd3f1a822949619beb6a0eae59dcfc143 Reviewed-by: hjk <hjk@qt.io>
* ProjectNodes: Move isGenerated from FileNode to NodeTobias Hunger2017-05-042-12/+19
| | | | | | | We have complex nodes like the ResourceTopLevelNode which can be generated. Change-Id: Ifdbe72323b668961c50252f597a0bf67ec41f30b Reviewed-by: hjk <hjk@qt.io>
* ProjectNodes: Use a set of flags for bools in NodeTobias Hunger2017-05-042-5/+8
| | | | | | | This has the potential to save some space per node. Change-Id: I2b8b65c13b355e680965bb7307f9e8d8714dae64 Reviewed-by: hjk <hjk@qt.io>
* ProjectNodes: Do not define a copy constructor for FileNodeTobias Hunger2017-05-044-3/+12
| | | | | | | Nodes are QObjects (still), so they should not have a copy constructor. Change-Id: I1b20663ee0ec121cda4d39ced7a9f204fb4621a1 Reviewed-by: hjk <hjk@qt.io>
* Project: Skip duplicate files earlyTobias Hunger2017-05-041-2/+2
| | | | | Change-Id: I9e2d8ce35c3f3901391c7494f1f3b60eee1bcd00 Reviewed-by: hjk <hjk@qt.io>
* ProjectNodes: Fix forEachGenericNodeTobias Hunger2017-05-041-1/+1
| | | | | | | | Iterate over all nodes in the whole tree, not just the FileNodes of the children of the current node. Change-Id: Ib8bf0eaecb2b13bd01dbc61417b83d0873ab6527 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Apply current filter to search resultsJarek Kobus2017-05-042-5/+1
| | | | | | | | | | | | | | | | | | | | | QHelpSearchIndexReaderDefault is run in a separate thread in order to return the results of the search. It reads the info about the current filter in order to filter out the results. However, the main thread didn't store the current filter in the qhc file, just in memory, and the search thread reads the value of the current filter from qhc file, so this goes out of sync. This patch stores the current filter in the qhc file whenever it is changed. The current code resets the current filter by the launch of creator anyway. Task-number: QTCREATORBUG-17845 Change-Id: I7c8d2c93b319c94e1400a677ecee9e9b41b029c3 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Describe changing QML type of item in Qt Quick DesignerLeena Miettinen2017-05-041-0/+7
| | | | | | | | You can now change the type of an item by double clicking the Type field in the Properties pane. Change-Id: Iacd70a595d693eb83d1b6d9fbfdf38429fd2706b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Describe the new toolbar in Qt Quick DesignerLeena Miettinen2017-05-046-9/+28
| | | | | | | | | | Some regularly used context-menu items can now be selected on the toolbar. Some of the icons are constructed at runtime, so images are needed for them. Some are in a new location that has to be added to the configuration file. Change-Id: Ibfc38ec21ed5526702abf89e64899efa5b978700 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* qtcreatorcdbext: Fix build with MSVC2017Friedemann Kleint2017-05-041-4/+8
| | | | | | | | | | | | | Fix error: .\containers.cpp(616): error C2664: 'void RedBlackTreeNode::debug<void(__cdecl *)(const SymbolGroupValue &,std::ostream &,unsigned int)>(std::ostream &,DebugFunction,unsigned int) const': cannot convert argument 1 from 'DebugPrint' to 'std::ostream &' with [ DebugFunction=void (__cdecl *)(const SymbolGroupValue &,std::ostream &,unsigned int) ] .\containers.cpp(616): note: A non-const reference may only be bound to an lvalue Change-Id: Ic4168fe8e3952c4c6b2bd6561f05c138094cb56e Reviewed-by: David Schulz <david.schulz@qt.io>
* Flat Dark theme: make "changed variable" color in watch window readableMitch Curtis2017-05-031-1/+1
| | | | | | | | | It was a dark red, which is really hard to read against a dark background. This patch makes it a pastel red, as was done for the Dark theme in bbb0de055397ddff72793b07bfda11f57bfb2083. Change-Id: Ieb78522b1e5282e2c35b18ec65c31f4aeb246ad8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ResourceNode: Set proper fileType based on file nameTobias Hunger2017-05-031-1/+1
| | | | | | | | | | Set the fileType of ResourceFiles based on their file name. This makes sure that QML files will be treated as QML, which fixes e.g. QTCREATORBUG-18032 (and probably other strange bugs). Task-number: QTCREATORBUG-18032 Change-Id: I05b1048d998ea1bed196611d529771c582bce441 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* CMake: Fix possible nullptr dereferenceTobias Hunger2017-05-031-1/+1
| | | | | Change-Id: Iadb62b671e115b2348dbe1d927212fd79a7fdf33 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CodeAssist: Fix use-after-free crashNikolai Kosjar2017-05-033-0/+9
| | | | | | | | | | | | | | | | ...caused by commit fab4dd068ed51f612e7beaf0985bcbe4411d2f01 CodeAssist: Fix auto completion if function signature is shown The crash occurs when e.g. typing "lib" in a *.pro file. Ensure to remove duplicates before filtering, otherwise the duplicates are removed afterwards and leave dangling pointers in the already filtered items (GenericProposalModel::m_currentItems). Change-Id: If6f027378beea2386d25389e366047a29513b553 Reviewed-by: David Schulz <david.schulz@qt.io>
* buildoutputparser: Adapt to removal of "slot" keywordChristian Kandeler2017-05-022-2/+3
| | | | | | | Was forgotten in 7b71ac3821. Change-Id: I5f2d5dc17092d2761c8ba98df8e82fb644954833 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlDesigner: Set the minimum width of navigatorThomas Hartmann2017-05-021-0/+1
| | | | | | | | | | | We set the same minimum width the item library has. This avoids overlapping icons, depending on the depth of the tree. Since we are rewriting the tree view anyway this should be good enough for now. Task-number: QTCREATORBUG-18131 Change-Id: Id5f018c118499a8a47785282a25a29d40e0685b3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CodeAssist: Fix auto completion if function signature is shownNikolai Kosjar2017-05-027-56/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3bf19030aba43e4c8326d921e2bf0b4506ea9bce. CodeAssist: Fragile proposals aren't closed by automatic proposals. which fixed the case [1] but introduced the regression in case [2]. Re- implement the fix for [1] in a different way: Check whether the new proposal has any items to show before closing the function signature hint. Case [1] void f(int); void g() { f(bar // This is what we will have in the end. The steps are: // 1. Type "f(" // --> OK, function signature pop up is shown. // 2. Type "bar" // --> OPS, function signature pop up is closed and no // new completion list is shown because "bar" does // not match any declarations. } Case [2] int barman = 0; void f(int); void g() { f(bar // This is what we will have in the end. The steps are: // 1. Type "f(" // --> OK, function signature pop up is shown. // 2. Type "bar" // --> OPS, no auto completion list for "barman" is // proposed. } Task-number: QTCREATORBUG-16934 Change-Id: I8456275d951de9e6fc53285a5dbcbd448d49ad08 Reviewed-by: David Schulz <david.schulz@qt.io>
* iOS: Fix run without deploy on iOS simulatorVikas Pachdha2017-05-023-7/+43
| | | | | | Task-number: QTCREATORBUG-18107 Change-Id: Ie847cdab672ff2df7af0c2fee742901de0783861 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Tests: Add some lines to test editing of strings in debuggerRobert Loehning2017-05-021-0/+9
| | | | | Change-Id: I5178724e693db53ffcd99e3d17c3f6d18da0ef09 Reviewed-by: hjk <hjk@qt.io>
* Squish: Update tst_HELP02 to use QTCREATOR_DISPLAY_VERSIONRobert Loehning2017-05-021-5/+5
| | | | | Change-Id: I7cffa591f036ea7ff1803a49a605030612dd787b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Improve handling of static members in shared objectshjk2017-05-022-0/+24
| | | | | Change-Id: I4978094dc5dcd0e57bb6790cfc8476a9db77724d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QbsProjectManager: Fix updating of run environmentChristian Kandeler2017-05-021-3/+8
| | | | | | | | When the build environment was changed, the run environment widget would not update. Change-Id: I8a318d86b5ac56ca9233cf4c694ca3c9f88870ed Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix left sidebar width after switching modesEike Ziller2017-05-022-32/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | After switching to debug mode, hiding left sidebar, switching back to edit, and showing left sidebar, the sidebar had very small width. We may not calculate the splitter sizes for each placeholder individually, because setting them on the splitter might distribute them in a weird way when widgets are hidden. In the above example switching back to edit mode while both sidebars are hidden triggered something similar to the following updates: Left side bar update: - calculated: (300, 1000, 0) - actual resulting: (0, 1000, 0) Right side bar update: - calculated: (0, 1000, 300) - actual resulting: (100, 900, 0) In the longer run it would probably be better handle the resizing in a more centralized way, since now it sets the same sizes twice (once for each side bar update). Task-number: QTCREATORBUG-18009 Change-Id: Ife5d6f1caded55f444245f4c3c98ae05371363b8 Reviewed-by: Serhii Moroz <frost.asm@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: David Schulz <david.schulz@qt.io>
View Lorry Controller Status