aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Android: Enable emulator tool installationv4.5.0-rc1Vikas Pachdha2017-11-213-2/+53
| | | | | | | | | Let Android sdk manager UI install the emulator tool. AVD needs this tool to manage AVD's. Task-number: QTCREATORBUG-19332 Change-Id: If836c511ca4a5673470d42c14115afa21b1b96fd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Fix tree scanner not getting run automaticallyTobias Hunger2017-11-212-13/+19
| | | | | | | | This lead to <Headers> entry being missing from the project tree. Task-number: QTCREATORBUG-19333 Change-Id: Ice3bab6d92aaa3799e66800cbae0bacd57537322 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Add identifying macro Q_CREATOR_RUNNikolai Kosjar2017-11-212-1/+7
| | | | | | | | | | Use the same we use for the built-in code model. This is useful for conditions of pragmas. Task-number: QTCREATORBUG-16847 Change-Id: I4c83be46bb2b8a23e4c8f70d98e2b4c9572121ee Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Fix handling of forward declared test classesChristian Stenger2017-11-201-2/+2
| | | | | | | | | | | | If a class has been forward declared we might not end up inside the real class declaration when trying to find declared test functions. So, do not just take the first found symbol into account, continue to process others if we haven't found the real declaration. Task-number: QTCREATORBUG-19319 Change-Id: I752d7a10470f5362e2214596966d93c037d58f4a Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Fix running Quick Tests with special functionsChristian Stenger2017-11-201-2/+6
| | | | | | | | | | If special functions (init, initTestCase, cleanup, cleanupTestCase) are present for a Quick Test they must get ignored when trying to run a single test as they cannot get explicitly addressed. Task-number: QTCREATORBUG-19311 Change-Id: Ie91928271928cf581bfef0b5e3463e027af985fd Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2017-11-201-0/+0
| | | | | | | To HEAD of 1.10 branch. Change-Id: I12398ee8eb381b31356fdc515d07addc9bf501da Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* AutoTest: Fix nullptr accessChristian Stenger2017-11-201-1/+1
| | | | | | Task-number: QTCREATORBUG-19313 Change-Id: I84a6f35c4da325ed5b0bd12de90cf156d27b86c5 Reviewed-by: David Schulz <david.schulz@qt.io>
* Use qbs.defaultBuildVariant to inform Qbs of the default build variantJake Petroules2017-11-171-1/+1
| | | | | | | | | | | | | Qt Creator always put its value for qbs.buildVariant in the config when building Qbs projects. That overwrote values applied by the multiplexing mechanism or by the project files, which is undesired. Instead, Qt Creator will now use the qbs.defaultBuildVariant property, which is provided for this reason. Task-number: QTCREATORBUG-19316 Change-Id: I923dfb6e083135b7c3ae6346af3ac639a4f02dbc Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QbsProjectManager: Run updateAfterParse() also on add/remove fileChristian Kandeler2017-11-172-3/+8
| | | | | | | | | | | Adding and removing files via the project tree is essentially the same thing as doing it by editing a project file, except that no reparsing is necessary. Task-number: QTCREATORBUG-19292 Change-Id: Idb1bcf0e183f34d4de513f69f974e45ac91afeeb Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Valgrind: Fix cyclic connectOrgad Shaneh2017-11-173-7/+1
| | | | | | | | | | | | | | | | | Editing the widget triggers rawPathChanged(), which calls setValgrindExecutable, which emits valgrindExecutableChanged(), which calls setPath on the widget. No other path reaches any of these functions. This causes the cursor to jump to the end, so if you want to change 'valgrind' to '/usr/local/bin/valgrind' you have to jump back after each character. Removed the now unused signal. Change-Id: Iaf4e902fb9a42975e9ada6662b7a64e53fab5cad Reviewed-by: hjk <hjk@qt.io>
* Valgrind: Fix callgrind parsing with git versionOrgad Shaneh2017-11-171-1/+3
| | | | | | | | | Commit db860c7cdce8765f8c4ec28127860c8e97ba34ab added a format marker to the file. First line is now: `# callgrind format` Task-number: QTCREATORBUG-19004 Change-Id: I2f6ed81044fa0d675a02b9634d8ee8e3ea1da6e5 Reviewed-by: hjk <hjk@qt.io>
* Debugger: Do not create a new terminal when attachinghjk2017-11-163-4/+5
| | | | | | | | ... to a running application that already has one. Task-number: QTCREATORBUG-19302 Change-Id: Id83f840408c26f3db85dbe30dadac9949ce6b660 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add isRemoteRunning() as isRunning() only apply to local processesFilipe Azevedo2017-11-162-0/+12
| | | | | Change-Id: I75d726cea160c557374051db3ba413d3dd1a41a2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlDesigner: Ignore indentation for multi line expressionsThomas Hartmann2017-11-161-2/+16
| | | | | | | | | | | | | | If expressions cover multiple lines they might be altered by the indenter. This means the expression differs slighlty in white spaces. This did assert before, but is a false alarm. For now we just treat the white spaces in th beginning of the line as a special case. Eventually we have to fully normalize expressions. Task-number: QTCREATORBUG-19284 Change-Id: Icc57ef08d1c889deded7cca08ccfba66f09f3115 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Utils: move 2 images to utilsTim Jenssen2017-11-159-11/+11
| | | | | | | select.png is used by the designer Change-Id: Icfa0ab4c931de7365c8bd252de0a0f972beb2c6c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: fix crash while adding a delegateTim Jenssen2017-11-151-6/+7
| | | | | | Change-Id: I5944332dcc741cb67be55062c5d24e293973f090 Task-number: QTCREATORBUG-19190 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Editor: Fix indenting on the very first position of a documentDavid Schulz2017-11-151-1/+1
| | | | | | Task-number: QTCREATORBUG-19294 Change-Id: I3c859d90f0c58165d526b2c9dd9a7afe2abda94b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Add enablers for frame scaling, movingThomas Hartmann2017-11-144-0/+38
| | | | | Change-Id: I24777f47f2f3826a21c7f5dd9984372b1738d2e3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Update state names if edited in textThomas Hartmann2017-11-142-0/+14
| | | | | | Task-number: QTCREATORBUG-19283 Change-Id: Ic627c609d784e570d47bcea2fdddf8ab9240ef92 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Filter modifiers in override eventThomas Hartmann2017-11-141-1/+6
| | | | | | | | | We have to ignore Qt::KeypadModifier. Task-number: QTCREATORBUG-19272 Change-Id: I0233812e3c7e4623a00ef077f9a5057db5ba8b93 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Catch potential exceptionsThomas Hartmann2017-11-142-4/+14
| | | | | | | | | This fixes any crashes related to uncaught exceptions when reparenting in the navigator. Task-number: QTCREATORBUG-19272 Change-Id: If087b866059cd285413d54f57d7c4199bfc50ba7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* iOS: Fix simulator startup for Xcode 9Vikas Pachdha2017-11-141-6/+25
| | | | | | | | | For Xcode 9 boot the second device instead of creating a new simulator app instance Task-number: QTCREATORBUG-19270 Change-Id: I68d1c319f8b5e709fc20462098db0c89a66566eb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ApplicationOutputPane: Handle runControl being nullptrTobias Hunger2017-11-141-7/+8
| | | | | | | | The runControl associated with a tab might become nullptr. That was already handled in some places. Do so consistently now. Change-Id: I899cc467a213f2a991967fa98a5819a98412d387 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* RunControl: Make RunControl::canReUseAppOutputPane more robustTobias Hunger2017-11-141-1/+1
| | | | | | | | | | | | | The pointer passed in was assumed to be non-null, but that does not need to be the case. This should make the function more robust in face of errors. The RunControl passed into the method is taken from a QPointer. So if the RunControl is destroyed, that pointer may be nullptr. Task-number: QTCREATORBUG-19269 Change-Id: I42e7b9d5582df2ee0830c8f92af4e4a97e7d6417 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Block project configuration widget while project is parsingTobias Hunger2017-11-141-0/+2
| | | | | | | | | | This prevents the user from changing settings while the project is parsing. Those changes would get lost. Task-number: QTCREATORBUG-18988 Change-Id: Ie04c6750c8aea3fe5543168ae4838f42fe488ca2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: Remove explicit GdbServerRunner's "Starting gdbserver ..."hjk2017-11-141-3/+0
| | | | | | | | Same (or similar, in case an explicit path is configured) message is triggered by the base class, no need for duplicated here. Change-Id: I1a3e3c386674e98dc0ddd31f1156f7e8254a53c2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* DeviceUsedPortGatherer: Clear used port list on (re)start, not stophjk2017-11-141-1/+1
| | | | | | | | | It's typically query handled after stop() (triggered by process finished), clearing the list then would essentially discard the result of the operation. Change-Id: I12fb09249f8437009d3365fadcca222855468cd7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* sdktool: Fix header file listTobias Hunger2017-11-141-1/+1
| | | | | | Task-number: QTCREATORBUG-19232 Change-Id: I5db60e284221775c4105dc43b0ea2a9044de6bcd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TargetSetupPage: Ignore changes while ProjectImporter is updatingTobias Hunger2017-11-141-3/+3
| | | | | | | | This causes the same kit to be processed repeatedly, which should not cause harm, but waste CPU cycles. Change-Id: Ie42272aacec6d8350398b65973570282c0c8d287 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* TargetSetupPage: Use old importer to clean up when switchingTobias Hunger2017-11-141-1/+2
| | | | | | | Use the old importer when cleaning while switching to a new importer. Change-Id: I8fd3af32271b839502571ee3806903abd927ef0a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* iOS: Fix missing URL scheme to fix QML profiling in iOSVikas Pachdha2017-11-141-0/+1
| | | | | | Task-number: QTCREATORBUG-19273 Change-Id: Iddf34493b46ed7afcedcc7d987260e7a744e4082 Reviewed-by: hjk <hjk@qt.io>
* CppTools: Fix highlighting when matching with scopeOrgad Shaneh2017-11-142-4/+33
| | | | | | | | | | | | | | | class Foo { void funcInside() {} void funcOutside(); }; void Foo::funcOutside() {} Search for Foo::func in the locator. func was not highlighted. Change-Id: I923bd3ef2df47c5fa030b8899d1b4df7437b1820 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* QmlDesigner: Update id in selection indicatorThomas Hartmann2017-11-131-1/+7
| | | | | | | | | If the id of a selected item is changed we have to update the selection indicator. Task-number: QTCREATORBUG-19267 Change-Id: I1f6b8f93fcf083972471837fd2837386adfabbad Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QtSupport: Add Qt version specific feature versionsAlessandro Portale2017-11-131-0/+7
| | | | | | | | | | | | Qt 5.9: Qt Quick Controls 2.2 Qt 5.10 Qt Quick 2.10 Qt Quick Controls 2.3 Change-Id: If683b6a4ec02128120597a2adbdfa10f111f9680 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: Set inferior device when attaching to running applicationDavid Schulz2017-11-134-1/+11
| | | | | | | | The device is needed to properly interrupt the inferior with cdb. Change-Id: I96f3a7393770be9821d8edd7123c458399d4494a Task-nnumber: QTCREATORBUG-19253 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Proper background for crumble barAlessandro Portale2017-11-131-6/+2
| | | | | | | Using Utils::StyledBar, and getting rid of one stylesheet. Change-Id: Idf4db461e6beb60e15cae9b295f13ec489146f4f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update qbs submoduleChristian Kandeler2017-11-131-0/+0
| | | | | | | To HEAD of 1.10 branch. Change-Id: I7f477b4970310121c6dfe326cca84032c1cf4117 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* ProjectExplorer: Fix copying of RunConfigurationAspectshjk2017-11-1041-317/+69
| | | | | | | | | | | Moving aspect data closer to real Value semantics fixes the regression introduced by 890c1906e. Task-number: QTCREATORBUG-19186 Task-number: QTCREATORBUG-19192 Change-Id: Ieaeef3995ae06a817f266c1e2514f9e5793bd4e8 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Kill RunWorker start/stop watchdog times in case of reportFailurehjk2017-11-101-14/+51
| | | | | | | Change-Id: I2eb4d9667482edbaafe6bf780a94e440c2d39881 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* RemoteLinux: Remove some unneeded code from GenericLinuxDeviceTesterhjk2017-11-102-15/+2
| | | | | Change-Id: Iabf995b340a521311f9f946c05e346ef07f4b3bf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix file system view layout on macOSEike Ziller2017-11-101-1/+9
| | | | | | | | | | | Combo boxes on Qt/macOS add an implicit spacing to their containing widget, which lead to a gray border around the tree view. Move the combo box into a separate widget to avoid the border around the tree view, and paint the background of the file system view to avoid a gray border around the combo box. Change-Id: I9cb8329f585d48016896d558e817c3d978a78669 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Remove unused functionThomas Hartmann2017-11-092-15/+0
| | | | | Change-Id: If2850329cc96e1ee7aba303e1ad56226d976f60b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* AutoTest: Ask for run configuration only if neededChristian Stenger2017-11-091-28/+33
| | | | | | | | | | | | If we cannot determine which executable to run we ask the user to specify which run configuration to use, but if there is only a single run configuration assume this one as correct and just pick it up without asking the user every time. Task-number: QTCREATORBUG-19200 Change-Id: Ie45cf354b595bc666a595f51844ad2453655e0da Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlProfiler: Reset the serverRecording flag when the connection dropsUlf Hermann2017-11-093-0/+26
| | | | | | | | Otherwise the run control will believe that the application is still running. Change-Id: I16ec9762362f526bd89eb21ceb82b89b295d7b5c Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Expose some helpers for themingThomas Hartmann2017-11-094-3/+31
| | | | | Change-Id: If86165ab9eb90b67f22c08d894b79f4db7c03765 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: fix replaceCssColorsTim Jenssen2017-11-091-1/+1
| | | | | Change-Id: I1b4f084c3bb88a68a5a54be2f68e86ec30996dfd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: just color the backgroundTim Jenssen2017-11-091-7/+16
| | | | | | | | Keep the style responsibility add the widget. So coloring the background with a helper widget is enough here. Change-Id: I24bb82786e2a8ef4af01b9719d2bad4aa1997f1f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Debugger: Squash some (wrong) transition warnings on QmlEngine shutdownhjk2017-11-081-1/+4
| | | | | Change-Id: I70d735d45012944b55476214c88a27abfd97612a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Remove public access to QmlCppEngine::m_qmlEnginehjk2017-11-082-15/+9
| | | | | | | Not used anymore. Change-Id: I30605916bcdb4e5231d86ddc371f2d41e3d9d526 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* UpdateInfo: Fix crash on close while searching for updatesEike Ziller2017-11-081-1/+2
| | | | | | | | | | The ShellCommand deletes itself if run asynchronously, and it also cancels itself when ICore sends coreAboutToClose, so we must be prepared for it to vanish at any time. Task-number: QTCREATORBUG-19165 Change-Id: I6d6a737ea529012976a623f812f2c426518557fd Reviewed-by: Orgad Shaneh <orgads@gmail.com>