Remove a bunch of BlackBerry specific code blocks and functions.
Change most instances of NDK/SDK (the BlackBerry terms) to SDP (the QNX
term). To maintain backward compatibility, some instances of NDK/SDK
that end up in external files have been left as is.
Change-Id: I8f589601542983323e41e7b2dd7822914d971623
Reviewed-by: hjk <hjk@qt.io>
Both wrap the corresponding Qt class, but make sure all temporary files
or directories are created inside a "master temporary directory".
Change-Id: I55461be507c828c965224c02863ea5ed9bbf9498
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Remove the code that supported "no environment script". Less code to
update for 7.0.0. No script is unlikely and a pseudo-script/SDP can be
created easily enough if a script isn't provided for an SDP.
Change-Id: I3e9cc9eb71d52c7662434bd8441eefa40956176a
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Change the code so that it detects a lot things that were previously
hard-coded.
Replace QnxArchitecture with Abi. There doesn't appear to be a good
reason to have a separate type.
The removal of Arch from qtversion.xml breaks backward compatibility.
Change-Id: Ic4f3a2de64f3f875841b73e9b12bbe0ea454eee8
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.
Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
They are needed to fix compilation of qnx apps from QtC. The mimicked
env vars are not enough to build qt apps for qnx660, so let's try to
return the right env vars, otherwise fallback to the old implementation.
Change-Id: I9cd0bbf18cea2ac51035f4cbc88c7e4063355830
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Keep QNX.
A short informal search did not turn up any more blackberry users,
even though there is interest in QNX. So this patch removes the
platform: We had no contact with the maintainers in months, there
are no changes going into the code for about as long.
I am not even aware of anybody testing the platform, so any
remaining users are probably better of with Qt Creator 3.2 or so
where the code was extensively tested.
Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
next if file =~ %r{src/shared/qbs|/qmljs/}
s = File.read(file)
s.scan(/^using namespace (.*);$/) {
ns = $1
t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
before = $1
char = $2
if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
m
else
before + char
end
}
if t != s
puts file
File.open(file, 'w').write(t)
end
}
}
Change-Id: I78a70180927d085822e215ffb2b8ad256301e4a7
Reviewed-by: hjk <hjk@theqtcompany.com>
Internal paths are supposed to be normalized
Change-Id: Ic6943ce13ad389dfdb44054a9e6f03da8c6cd88d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
On OS/X, use the darwin subdirectories in the environment. Makes it
easier for those of us with access to the OS/X based QNX tools to use
Qt Creator on OS/X.
Change-Id: Iebc3a89978e6211781404bfc8a4ba95a3523d8b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This is relevant for the case that the organization
name is empty.
Change-Id: Ib638c29610b7c268886602609368bb03f120c14e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.
* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.
Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
We have fileNameCaseSensitivity and withExecutableSuffix et al.
Change-Id: I79bd2cd57e258c3f15673a661a49bab597d7afa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This is a first patch that adds basic support to manage
user's QNX configurations.
Change-Id: I273939d39e4353dabc2ae3873d7d7be6b3ca9d47
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Add a QnxBaseConfiguration class as base class for
the BlackBerryApiLevelConfiguration and the new
QnxConfiguarion classes.
The split of the BlackBerryApiLevelConfiguration logic
makes the code more flexible to add support for
the user's SDP/Qnx configurations.
Upcoming patches adding support for the SDP/Qnx configuration
will depend on this change.
Change-Id: I44258d9a9f0dc44bb196f4178974ad04d4caf70a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Change-Id: I3aca5575d4a925ee2efcf891f558105ffcec6094
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Add a bbndkconfigurations.xml file to store BlackBerry user configurations
* Save both manual and auto detected user configurations
* Mark invalid configurations in the BlackBerry settings widget
* Provide a cleanup user action to clear invalid configurations
Task-number: QTCREATORBUG-11004
Change-Id: Ibb29aa5010317f62233865d42d6ca4ae3afa0de3
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
The function's operation of simply appending the string as is would be
fine if FileNames were strings. But they aren't, so the function name
should be intentionally ugly to stand out.
Change-Id: I85e16844e2d69cacb6566c538182b84300c45161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Depending on NDK version, the application used for the
SDK installer is different.
Without this, the installation of NDK's is not possible
from within Qt Creator.
Change-Id: I71ba67ccb05d30bcef5b63e7e397e545c5a89e3e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
QnxUtils::qnxEnvironmentFromNdkFile() function was parsing the content
of the bbndk-env.sh/bat script file to resolve environment for BB10 tools.
The content of the script file is not documented and is a subject
of heavy and frequent changes.
Now QnxUtils::qnxEnvironmentFromNdkFile() function executes the script file
and dumps the important env. variables that are parsed standard way.
Change-Id: Ie7636054d62ec62b32cd3ab3d93a59b7d6c0882a
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Fix the way we parse PATH and LD_LIBRARY_PATH.
Change-Id: I9928bf3573728580af6f361ce30101d8db142fc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Change-Id: I10e5f7b4c9d0d527f8df34aa425a2a0bdaac5243
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Basic implementation of an install/uninstall targets utility.
Note: This does not support 10.1 NKDs.
Change-Id: I3bb29ef467dd24a121ee59e11abb2237dcff696a
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
The new bbndk 10.2 is based on multiple targets (based on multiple bbnk-env scripts).
There is no default/common bbnk-env.sh file anymore, and an NDK directory may contain
various bbndk-env scripts (i.e targets).
This patch makes the BlackBerryConfiguration based on the bbnk-env script path
rather than on the NDK path. This will enable having multiple configurations
per targets in the same NDK directory.
N.B: NDKs 10.1 with one default bbnk-env file are still supported.
Change-Id: Icec57c6e722caec7e5ff81e3a9ce4d2cf11f249a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
In recent internal NDK versions (10.2) some new
environment variables are introduced (they are evaluated
when soucring the bbnk-script) that QNX_TARGET and QNX_HOST
are depending on.
This patch is a workaroud, in the future the parser
should be deprecated/replaced to make the plugin less depending on
the bbndk-scrit changes.
Change-Id: I8d2dc7f0a87cbada6f8807df2bafdfd14476e01d
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Some changes in the new NDK 10.2 break the setup of BlackBerry 10.
Main changes that the current patch covers:
* Qnx environment variables are evaluated when sourcing the bbndk-env script
and are no longer hard coded when istalling the NDK
* The version number is appended to the bbndk-env file name.
More eventual changes may come and we may need to directly
parse the ndk xml descriptor file.
Task-number: QTCREATORBUG-9403
Change-Id: Ie7daf7b0eaf2a49339775cacb9973062d6101afa
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
These are for configuration of process and ports gathering activities,
respectively.
This couples related functionality more tightly, while keeping
the number of IDevice methods at a reasonable level.
For ports gathering, the patch also adds the ability to configure
both the command and the parsing function; the latter used to be
hardcoded in the PortsGatherer class.
Change-Id: I1b8940397a51efa7ddc05dd15cf861777d118c1a
Reviewed-by: hjk <qthjk@ovi.com>
This class aims to be a flexible worker class for SSH-based
run controls. It supersedes AbstractRemoteLinuxApplicationRunner
as well as all of its derived classes, while having no
RemoteLinux dependencies itself.
Change-Id: If24f03a32126b36fc3d0b253a1615ad0af5f2b46
Reviewed-by: hjk <qthjk@ovi.com>
This plugin adds support for cross-compiling, deploying, running
and debugging on a PlayBook or QNX Neutrino device.
Change-Id: I0da7ccee40bd7ce4c0d6bdc6884d48ef23167dac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
