aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qnx
Commit message (Collapse)AuthorAgeFilesLines
* Add final specifies to classesIgor Sidorov2020-02-051-1/+1
| | | | | | | Warning -Wfinal-dtor-non-final-class in clang trunk Change-Id: I2bf17064bf8898eab10b82b69583a283157766d0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Several SettingsPages: Code cosmeticshjk2020-01-301-1/+1
| | | | | | | De-Q_OBJECT-ify, remove unnecessary #includes, final-ize, etc. Change-Id: I461d3e73400dacac90c22e7c84a40e3ea1718b6e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* De-Q_OBJECT-ify most DeviceFactorieshjk2020-01-232-5/+3
| | | | | | | | | | WinRt is the odd one out. Some were using setObjectName, but only used for debug reasons, not really needed. Change-Id: I4a370e4694443bc1c455fda4337ef3acfb9259b8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qnx: Do not offer incremental deploymentChristian Kandeler2020-01-151-2/+9
| | | | | | | | | We don't know of a way to retrieve machine-readable file timestamps on that system. Fixes: QTCREATORBUG-23429 Change-Id: Ib33b09e7dffaa296cf1dc44dd5b4b41821e44e3a Reviewed-by: hjk <hjk@qt.io>
* Core: Provide empty implementation for IOptionPageWidget::finish()hjk2020-01-151-1/+0
| | | | | | | | Having it pure virtual only lead to a lot of unnecessary re-implementation. Change-Id: I37f71d1a160e21b93c7c73a6304b0eb6d5f0441d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qnx: Apply recent IOptionPage patternshjk2020-01-157-337/+205
| | | | | | | ... and clean up. Change-Id: Icbfb12b1c452ce60105abed07d1e87be6ae08ea7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Remove enabledChanged emissionshjk2019-12-201-1/+0
| | | | | | | | | ... from *RunConfiguration::setUpdater implementations. The RunConfiguration::update() emits it unconditionally nowadays. Change-Id: I0a67b760ea611026bd2357f59090166be8e0d6b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Re-inline some of the RunConfiguration::setUpdater()hjk2019-12-182-14/+9
| | | | | | | ... after the latest 4.11 -> master merge Change-Id: I04352c6bd83edc8853598b69570844714d1bb60a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Replace RunConfiguration::doAdditionalSetuphjk2019-12-172-6/+0
| | | | | | | | | ... by an explicit update() call. This is what effectively done in most cases, and should be harmless and reasonably cheap in most other cases. Change-Id: I323112ec7cdbccf19050ac54466d8e1d97a0516e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Debugger: Rename some GdbServer* to DebugServer*hjk2019-12-171-2/+2
| | | | | | | | | This is mimicking a bit what has been done on the baremetal side, and is formally more correct when the gdbserver is not a real gdbserver, but e.g. a probe speaking the gdb remote protocol. Change-Id: I1b42624b94071b34c009bd0650095792a5b2fcb7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-12-162-11/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/boot2qt/qdbrunconfiguration.cpp src/plugins/boot2qt/qdbrunconfiguration.h src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/qnx/qnxrunconfiguration.cpp src/plugins/remotelinux/remotelinuxrunconfiguration.h Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
| * Qnx: Add QnxRunConfiguration::doAdditionalSetup()Christian Kandeler2019-12-122-16/+27
| | | | | | | | | | | | | | Same principle as in b526d789cf. Change-Id: I79b69f709ab401b46d2edef3b5a6b0672e30eaff Reviewed-by: hjk <hjk@qt.io>
* | Standardize RunConfiguration id specificationhjk2019-12-112-3/+1
| | | | | | | | | | | | | | | | | | | | | | Use the cheapest of all patterns used so far, they are only used exactly once. Normalizing the id values to a common patters is not as simple as they are stored in .user files. Change-Id: Ib4d037a88a7a5ca2ea94dfb3933d17122c89240f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Let RunConfiguration not listen to Kit changeshjk2019-12-021-1/+0
| | | | | | | | | | | | | | | | Relevant kit changes are (hopefully) triggering re-parses and build changes, which in turn trigger run config updates. Change-Id: I229699ac92eee615f246dcacea608279044dc1d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Consolidate some Session::active* accesseshjk2019-11-291-1/+2
| | | | | | | | | | Change-Id: I47b0f6c2c60b2f7c86b6ffd1ad3df393d1321c8b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Qnx: use new runconfiguration aspect update mechanismhjk2019-11-271-4/+4
| | | | | | | | | | Change-Id: Ia81313e9b08ba5569f01c4d2bbf3c26c96cc78d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Qnx: Remove unused codehjk2019-11-252-8/+0
| | | | | | | | | | Change-Id: I84a87be28a4d94c733d17e6b27dd4b25d9ad2fae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Introduce and use a Target::buildSystemUpdated signalhjk2019-11-211-3/+2
| | | | | | | | | | Change-Id: I497d46866146600a1ed9162bd720c574ee4d4769 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Move BuildSystem owership to BuildConfigurationhjk2019-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or Target. This patch moves build system from conceptually "one per project" to "one per target (i.e. per project-and-kit)" or "per BuildConfigurations" for targets where the builds differ significantly. Building requires usually items from the kit (Qt version, compiler, ...) so a target-agnostic build is practically almost always wrong. Moving the build system to the target also has the potential to solve issues caused by switching targets while parsing, that used Project::activeTarget() regularly, with potentially different results before and after the switch. This patch might create performance/size regressions when several targets are set up per project as the build system implementation's internal data are duplicated in this case. The idea is to fix that by sharing per-project pieces again in the project implementation once these problems occur. Change-Id: I87f640ce418b93175b5029124eaa55f3b8721dca Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Qnx: Do not read CPU dir from mkspecTobias Hunger2019-11-144-11/+16
| | | | | | | | | | | | | | | | Generate it based on the detected ABI instead. Change-Id: I979d02a8d97bd54575095eaa5100d3572d0ced2c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Partial compile fix for current Qt dev and/or Qt 6hjk2019-11-121-1/+1
|/ | | | | | | | This does not cover Utils::MapReduceOption with QVector, and code that's not compiled on my machine. Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix lupdate issuesEike Ziller2019-11-041-0/+2
| | | | | | Change-Id: Ib0cbb96a1a4857db5724f9d1e316b97bf2827dbd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Qnx: Fix progress bar in Qt library deployment dialogChristian Kandeler2019-10-231-6/+5
| | | | | | | | Amends d7178b88c4. Task-number: QTCREATORBUG-22885 Change-Id: Ic60e37382073c9d867afa93b28c7cf3df423fb25 Reviewed-by: hjk <hjk@qt.io>
* Qnx: Suppress warnings about missing statChristian Kandeler2019-10-181-1/+4
| | | | | | | | These warnings are only relevant for incremental deployment, which is not used here. Change-Id: I52636b0c3f7ba89131c27fc5e66c23e8a6ea9990 Reviewed-by: hjk <hjk@qt.io>
* BaseQtVersion: remove qmakeProperty(...) getterTobias Hunger2019-10-013-11/+11
| | | | | | | | | | | | Qt 6 will not use qmake to identify a Qt version, so this can not be part of the public interface of BaseQtVersion anymore. Provide getters for the information actually read via qmakeProperty(...). Use the getters whenever possible. Change-Id: Iadbee80b75e4f8b06caf90e7ed69fae2029b4dd7 Reviewed-by: hjk <hjk@qt.io>
* Merge "Merge remote-tracking branch 'origin/master' into 4.11" into 4.11The Qt Project2019-09-272-5/+10
|\
| * QNX: Use the QNX_CONFIGURATION_EXCLUSIVE envvar in QnxToolchainCristian Adam2019-09-272-5/+10
| | | | | | | | | | | | | | | | | | QNX_CONFIGURATION_EXCLUSIVE is responsible for license checking failure when qcc was probed for capabilities. Change-Id: Ib7efa9eba3b2f3cb131899aa6cb75e632446342c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
| * QNX: Add C compiler in the compiler selection dialogCristian Adam2019-09-261-1/+2
| | | | | | | | | | | | | | | | QNX compiler can also do C, and it's needed for properly configuring a CMake project. Change-Id: I68edf35d7e288400f48b59c258065e6f82d17fc4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | RemoteLinux: Use the "install to local dir" step in derived pluginsChristian Kandeler2019-09-271-0/+7
| | | | | | | | | | | | | | | | That is, Boot2Qt and Qnx. Task-number: QTCREATORBUG-22822 Change-Id: Id48069c6ee2bc857a94be173b6c1de9bc69404a8 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.10' into 4.11Eike Ziller2019-09-271-1/+2
|\ \ | |/ |/| | | Change-Id: I57c2c6b5736c1aa3e1831eea0ae0a0638feacc39
| * QNX: Add C compiler in the compiler selection dialogCristian Adam2019-09-261-1/+2
| | | | | | | | | | | | | | | | QNX compiler can also do C, and it's needed for properly configuring a CMake project. Change-Id: I68edf35d7e288400f48b59c258065e6f82d17fc4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Remove unused QObject parent arguments on options pageshjk2019-09-112-3/+4
| | | | | | | | | | | | | | | | In the new plugin setup scheme they are data members of the plugin pimpl and never use the parent. Change-Id: I28fe150393e8159064dcfbd113ce0320af50fd58 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: Use std::function for SimpleTargetRunner::start()hjk2019-09-043-73/+42
| | | | | | | | | | | | | | | | | | This spares us the typical r = runnable(); modify(r); setRunnable(r) roundtrip and the m_runnable storage that might or might not be the same as runControl->runnable. Similar for m_device. Change-Id: I8300260dd8dd7cd395e40bcd3d2ae45089085008 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Rename BaseStringAspect::{f,setF}ileNamehjk2019-08-292-2/+2
| | | | | | | | | | | | | | ... to filePath and setFilePath. In line with Utils::FilePath. Change-Id: I7115b91876542629c3d61c8259bbd8d9f4022fc1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Proliferate FilePathhjk2019-08-291-4/+4
| | | | | | | | | | | | | | DeployableFile and fallout. Change-Id: I9a9c56e4a4ebf8f68df70d65da2e699efedfe907 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Standardize RunWorker creation logichjk2019-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This unifies the remaining paths of RunWorker creation to always use RunWorkerFactories in the plugin pimpls. There were, and are, still effectively three basic kinds of workers: - "toplevel" tools corresponding to the run modes, that are often all that's used for local runs and directly started via the fat buttons or e.g. entries in the analyze menu, with factories already previously located in the plugin pimpls - core "tool helpers", providing tool specific functionality typically used in conjunction with a remote device specific run mechanism, set up via RunControl::registerWorkerCreator - target/device specific runhelper like port gatherers contructed e.g. via *Device::workerCreator(Core::Id id) Worse, these categories are partially overlapping, so it was not clear how a "clean" setup would look like, instead some ad-hoc cobbling "to make it work" happened. In some cases, the runMode id was used throughout the whole ensemble of run workers for a given run, and which worker exactly was created depended on which of the mechanism above was used in which order. With the new central setup, the top-level runmodes remain, but the second kind gets new ids, so the implicit dependencies on order of setup mechanism are avoided. This also helps in the cases where there was previously unclarity of where and how to set up worker factories: It's always and only the plugin pimpl now. Change-Id: Icd9a08e2d53e19abe8b21fe546f469fae353a69f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Let PortsGatherer produce full URLs instead of ports onlyhjk2019-08-262-12/+7
| | | | | | | | | | | | | | This is what the consuming code expects in most cases. Change-Id: I135592039e28b994996186f627215ab1d2f8d6dc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Utils::Environment: Use expanded valuesChristian Kandeler2019-08-202-3/+5
| | | | | | | | | | | | | | | | | | The Environment class is supposed to support values with references to other variables, but we failed to actually expand them in most places. Fixes: QTCREATORBUG-22687 Change-Id: I108cb59d3b4571471423455240f6f4f1cf64bf05 Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: Base IDevice::osType on a data memberhjk2019-08-192-7/+2
| | | | | | | | | | Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Utils/all: Create an OutputFormatterFactoryhjk2019-08-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | Essentially following the scheme used for the various project configurations. This makes it possible to construct OutputFormatters by Id only, potentially reducing hard plugin dependencies and opening the road to have several output formatters per RunConfiguration/Outputpane/... Change-Id: I4b5fb6fb6be8b0d9a0859f178bb0effc3398b09e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Re-work setup runworker factorieshjk2019-08-091-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This combines two of the previous three paths to create run workers, and refers to RunConfigurations by id, not by type where possible to decrease coupling between the classes. Only allow "type of run configuration" and "type of device" as the only possible kind of restriction and require a uniform RunWorker constructor signature. Adapt user code to fit that pattern. Change-Id: I5a6d49c9a144785fd0235d7586f244b56f67b366 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Qnx: Remove RemoteLinuxRunConfiguration base from QnxRunConfigurationhjk2019-08-062-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | Also un-export RemoteLinuxRunConfiguration and make it clear that this is not meant for inheritnace. For a while the last code-reuse-by-inheritance RunConfiguration, until it served as precedence again. Raise the bar a bit, even if this means duplicating some aspect setup lines. Change-Id: I588e07e3f7ddbe3cae089a37059781a9f71048e1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer::IDevice: Add a default display nameChristian Kandeler2019-08-022-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-16281 Change-Id: Ieff929343b5dc3a84d9ecf5f4f0a032cb4ae4076 Reviewed-by: hjk <hjk@qt.io>
* | Replace remaining Utils::FileName occurrences by Utils::FilePathhjk2019-07-232-3/+3
| | | | | | | | | | Change-Id: Ic3120f18b4fbe90219de9128dba53d7453630b03 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Avoid warning on empty expressionshjk2019-07-231-1/+1
| | | | | | | | | | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-06-281-0/+9
|\| | | | | | | | | | | | | | | Conflicts: CMakeLists.txt tests/unit/unittest/unittest.pro Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
| * Qnx: Do not deploy files that are not neededhjk2019-06-211-0/+9
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-20000 Change-Id: Ie9a2341a3bcd1531bc83b54bf43466df1347627c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Qnx: Check for presence of "mkdir" on the devicehjk2019-06-251-0/+1
| | | | | | | | | | | | Change-Id: I9fc00a43cc143c8b9f2105ab74466e4c6c57d5a2 Task-number: QTCREATORBUG-22591 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Use Utils::FileName for Runnable::executablehjk2019-06-214-12/+12
| | | | | | | | | | Change-Id: I584bc18aa19a4c9886af7b13e95052dfd4350b34 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Use data member for ToolChain::typeDisplayNamehjk2019-06-202-7/+1
| | | | | | | | | | Change-Id: Ia78ea3f8628b759706c5b024d687d917b203ec4d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>