| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Use the official packages instead of compiling Qt ourselves.
This simplifies the Docker image a lot. For accessing the
script folder, the Docker context needs to change to the
root directory. Thus, we need a .dockerignore file to keep
the size of the context low.
Change-Id: I58ec8f364feba955518f1eaf5bff234332ae8dec
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I0cb4e24f42945b88ef2ff283d4809d47cf95e81d
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I4747e3e99015fef93cc2c072a49c787d8c42811f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This was apparently forgotten when the 1.14 branch was created.
Change-Id: I6d6d1e11566ad873f214599b2642610d31bf8ab1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
| |
Change-Id: I6b009a42e2383d792d6a22c9f7343efd342454c9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ibd5e115dbb1dc5ad6bfb5ee779cf3cb96aa00561
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Right now it is possible to generate a native projects for the
KEIL UVision IDE, e.g. using the following command:
qbs generate -g keiluv5 -d <path/to/build/directory> -f <path/to/qbs/project> profile:<your/qbs/profile>
We need in a valid KEIL QBS profile, from which the generator take
a desired target architecture and other stuff.
The KEIL UV generator has a semi-intelligent logic, it parses a source
QBS project and converts a compiler flags and other stuff to an
appropriate configurations of the native KEIL UVsion project.
Currently it is supported only one 'keiluv5' generator which allow to
generate a projects for the KEIL UVision v5 for ARM architecture.
Tested with the KEIL UVision v5.23 for ARM, using as the QBS
bare-metal examples, and as other projects.
Change-Id: I3af9d01f25a9570a99a62d4ce2c30fec3566b9a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Move an architecture-specific code to a functions in the sdcc.js file.
* Remove the redundant copy-paste code.
* Align order for assembler, compiler, linker and archiver flags to
the unified form, like:
<inputs> <outputs> <defines> <includes> <flags>
* Add some comments.
* Fix handling of cLanguageVersion property.
Change-Id: Id787b4455847ac5dde4a926d850e7c076edc34d2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Move an architecture-specific code to a functions in the keil.js file.
* Remove the redundant copy-paste code.
* Align order for assembler, compiler, linker and archiver flags to
the unified form, like:
<inputs> <outputs> <defines> <includes> <flags>
* Add some comments.
* Fix handling of c{xx}LanguageVersion property.
* Fix JS warnings about the variables re-definition.
Change-Id: I708a446292e6f5c6bfb56ef3fa92815123808ccf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The KEIL IDE examples contains the following patterns
[*.s, *.a51, *.asm] for the assembler files.
So, we will use same patterns too, which are intended:
'*.s' - for ARM architecture.
'*.a51' - for 8051 architecture.
Change-Id: I8268d309bb6e9237a0f64d3280163afa997bfb81
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The IAR EW IDE provides the following file patterns
[*.s*, *.msa, *.asm] for the assembler files.
So, we will use same patterns too. But, instead of '*.s*'
pattern we will use a set of the following patterns:
'*.s' - for ARM and/or STM8 architectures.
'*.s43' - for MSP430 architecture.
'*.s51' - for 8051 architecture.
'*.s90' - for AVR architecture.
Change-Id: I5aad9ee7a81325e65be18d0ae0e0c1c9a9f6cf27
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Move an architecture-specific code to a functions in the iar.js file.
* Remove the redundant copy-paste code.
* Align order for assembler, compiler, linker and archiver flags to
the unified form, like:
<inputs> <outputs> <defines> <includes> <flags>
Change-Id: Ibfdc536f78d1145f6e1190da33f67b0fb7063f05
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Richard Weickelt <richard@weickelt.de>
|
|
|
|
|
|
|
|
| |
This fixes compiler warnings about hidden virtual functions in derived classes
Change-Id: I3b53d07263f66133a41353eb6cfe05e1f3b20cc3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This commit adds a simple example for the msp430-based microcontroller
which blinking of the red LED and can be built for IAR EW toolchain.
Change-Id: I5025130848020e71bef449f0ed15da1f68698e79
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ifc15d008ffd64e160d40a0a3e0f1b868dde4e8a4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit adds a basic support of the IAR Embedded Workbench
toolchain for the MSP430 processors family.
To use it with Qt Creator, it is enough to add there a desired Kit
with a custom IAR C/C++ compiler, and then set the following in the
Kit's Qbs profile settings:
* Key: qbs.toolchainType
* Value: iar
Tested with EW for MSP430 v7.12.4 on Windows using the simple
projects samples which come with the default IAR installer.
Change-Id: I6a31da1823fd08ba7bf41a315ac20e98f5ba77f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Icf6b9f7528bdb4b062b6586b12a08d8b410090fd
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is about clang in "mingw mode", not clang-cl.
When targeting Windows, clang is a lot like mingw, so factor out the
common parts into a new base module.
Testing uncovered a number of invalid assumptions in our autotests,
which are also fixed in this patch. In addition, minor adjustments had
to be made to the Qt.core module and to the qbscore lib.
Change-Id: I73085dc62a65e2a9d0397cf234c8641989246f22
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I340c66090f0934eb2bc6dccdd0c2dbe1b1e1db2f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
One of the main problems in virtual environments like Travis CI is how to
install Qt and QtCreator. The official installer provided by the Qt Company is
almost unusable from command line. It is even harder to select only certain
components (especially QtScript). Luckily, all components are available online
under http://download.qt.io.
This script installs components from the official Qt package repository. It can
be used in any bash environment to simplify the setup procedure and supports
every valid combination of host OS, target platform (desktop, android, ios) as
well as toolchains.
Dependencies:
- bash
- curl
- 7z
Change-Id: Ia2080cb80df98551332eb02c85c5933fd3bdaa4e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
TestBlackbox runs for more than 10 minutes in the Windows environment on Travis
and since recently also on Mac OS. This might trigger a non-configurable 10
minutes timeout due to no output generated by Qbs. The official workaround is
travis_wait. But it is flawed, because it accumulates all output before it
prints something, thus making it impossible to watch the output of a running
build. This problem is often not noticed because other tests may run in parallel
and produce output.
This patch adds a background process which outputs an empty line every 9:50
minutes while running autotests.
Change-Id: I0ac5d0f581aabbc0d8641a13e7d207dc84902b95
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ia90ea48e414fe9c4041f4bfc6961638b8a49fec4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
Amends 923f98062b.
Change-Id: Ib98279e962128573a46d8d6f9cfd822494d0dfd8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jochen Ulrich <jochenulrich@t-online.de>
|
|\ |
|
| |\
| | |
| | |
| | | |
Change-Id: Ib40a6fb77dfb1653910e802276571fc5dcea4d64
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I90cece156033b5d223a86016401a2199f5b6c11e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I906f63236230f10e6bdfb16ef3ee25cee8c407f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I99bfb12bde67eb815f05451d4fdee48aef685699
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: Ib69952c190555401c6acdb48971ec0833215723a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1454
Change-Id: I6e2514d10cca0cba0a14456ecd2abfb495539ee4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I3ae23881f310393c82935ef59e91609e6b13efeb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Right now it is possible to generate a native projects for the
IAR Embedded Workbench IDE, e.g. using the following command:
qbs generate -g iarew3 -d <path/to/build/directory> -f <path/to/qbs/project> profile:<your/qbs/profile>
We need in a valid IAR EW QBS profile, from which the generator take
a desired target architecture and other stuff.
The IAR EW generator has a semi-intelligent logic, it parses a source
QBS project and converts a compiler flags and other stuff to an
appropriate configurations of the native IAR EW project.
Currently it is supported only one 'iarew3' generator which allow to
generate a projects for the IAR EW for STM8 for all versions of 3 series.
Tested with the IAR EW for STM8 v3.11.1, using as the QBS
bare-metal examples, and as other projects.
Change-Id: I47880d62cd1e81ed7bbfba840a5af0c558065013
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Common code which are used for the 'iarew' and 'keiluv'
generators was moved to the corelib/generators library.
Besides, this code also can be used in future for the
XML-based generators.
Change-Id: I79a21e3e078d563600d7f365785731fe9e847045
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
... that allow to auto-detect the GCC toolchains with
names like 'avr-gcc-5.4.0' and so forth.
Change-Id: I004f68b8aeb2a17124cfd53d3643584dc6aa1bc6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Right now it is possible to generate a native projects for the
KEIL UVision IDE, e.g. using the following command:
qbs generate -g keiluv5 -d <path/to/build/directory> -f <path/to/qbs/project> profile:<your/qbs/profile>
We need in a valid KEIL QBS profile, from which the generator take
a desired target architecture and other stuff.
The KEIL UV generator has a semi-intelligent logic, it parses a source
QBS project and converts a compiler flags and other stuff to an
appropriate configurations of the native KEIL UVsion project.
Currently it is supported only one 'keiluv5' generator which allow to
generate a projects for the KEIL UVision v5 for 8051 architecture.
Tested with the KEIL UVision v5.23 for 8051, using as the QBS
bare-metal examples, and as other projects.
Change-Id: I248f1d220d9c9bcae9cb07d5bfbabbb85f9c39c9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
... provided by Microchip (Atmel).
Change-Id: I230899e53cac3029fd910c9a3cc8112c86fd1ac0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... which are installed from this site:
https: //developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm
Change-Id: Ic7e8886e53ede7b86289ef514eccd94870e17676
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
... as this flag automatically sets inside of SDCC module.
Change-Id: If670a3a67ed66f8fe9f2209e5259e57a1fb85f49
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I00b62a426e806bbb57526658f7a5d3cb9a210b48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* SDCC support only the '.lib' library suffix.
* SDCC support only the '.rel' object suffix.
* SDCC produce the 'ihx' default image format.
Besides, SDCC expect same target flag for both compiler
and linker. We automatically take this flag from
the cpp.architecture property.
Change-Id: If7eac1d5ddc0c571d3c6a870f46f78d61d699f12
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ic632b377bf10e2b320956011e9a7d4eea99f560b
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Now also check for the clang-cl in the default install locations
Task-number: QBS-1316
Change-Id: I5d0dfd2b98164b0cac08358001cd1946b4f8aadc
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... which is used at dumping of predefined macros
and a header paths.
Reason is that for the different architectures the IAR
use different C++ language options:
* for ARM: --c++
* for AVR or 8051: --ec++
Change-Id: Ic2b4d50e9e2a978a5cbc69ed5353d5953e83c85d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iff45f56fc91f3d513440a3e2aaf519a7aa0f7744
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8fe64c2ab78b1cf2e1af2a6aa2dad201299a0a94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Amends 38c897a0d4.
Fixes: QBS-1458
Change-Id: I2b3d72f5d738cc45fa061ce47711160d54bdfdc5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Amends 65cb0d3e2d.
Fixes: QBS-1459
Change-Id: I771cc179bcc996559d76c85d785780a1b044812b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes (at least) two compile errors:
- clang: error: invalid deployment target for -stdlib=libc++ (requires
iOS 5.0 or later)
- ld: library not found for -ldylib1.o
The dylib1 is only present on macOS and not present in recent tvOS/iOS
SDKs, clang tries to link to it if deployment target is less or equal to
"5.0".
Change-Id: Ie77a514bb2661312823df054f0dfca07d69e3059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I1c57713abf60c2b5b6ee7bf6a0b403736b60307b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It seems, that console ios apps should not try to do a _qt_main_wrapper
trick since there's no platform plugin linked to the app and linker
fails to find wrapper.
Change-Id: I607db658d5e25d6029626b4a7efb46b2e228ab52
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|