| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As far as I can see, this shouldn't happen, but let's prevent a crash at
least in case it does.
Task-number: QTCREATORBUG-22539
Change-Id: I4bd36364ca3f8bb8cdbe445e5b14037758b1e1fc
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: If0b411c734ddbb357843d6513a36a70d5c09a6fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously we have only the IAR toolchain version detection from
the Windows registry.
This patch adds a compiler version detection in case the compiler
path specified in a PATH environment variable.
Change-Id: I61578723e15f109542aba1e231753aec611439eb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is useful in case we have installed a multiple toolchain
versions.
Change-Id: I4a2030589c21394da1b951eeeee99cbb5e1116a3
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is useful in case we have installed a multiple toolchain
versions.
Change-Id: I842cc5c5d281427385306e9d4aaaee7736a8a227
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
|
|
|
|
| |
This is useful in case we have installed a multiple toolchain
versions.
Change-Id: Ia6d5fa1be16199d5e5f1eea8a077fcb885ba42e6
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Idab53d6bd9b6f2841e30d4a31f53ac53a05c2f09
|
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1451
Change-Id: I644835cf8ce18d546e6c8e2c75f689766456555d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Archive tries to locate those modules via pkg-config and fails; just
ingore those if docs are not required.
Change-Id: Ia8743810905f5f2e21687286b09d92d34744e327
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I5b7a8927162821042ac0190fedac2ea14fc24223
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Some of them are false positives, some of them are possible bugs.
Change-Id: Ic9c8a2970587e5152659b5b19f6b6d6df67e6809
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Amends f08904c155ad, 39462767f9c8, c3f90175c389.
Change-Id: If3535ba8502ab3de4eccc6b33c29b205c9a0b889
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|\ \ |
|
| |\|
| | |
| | |
| | | |
Change-Id: Ic8e80604deb03e48fe264271de2e0add5023af87
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When re-resolving a project with an existing in-memory build graph, we
must make sure that the old project object does not remove the generated
modules from the build directory in its destructor.
This fixes the following bug in Qt Creator:
- Open a project initially (but do not build).
- Edit the project file and re-resolve.
- Build the project. This now fails, because the generated modules
were erroneously removed in step 2.
Change-Id: If6c1c1ed986e8f00e4d89ba5525bac7e032388d9
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Amends commit f4f443a16a342300638d364175cf2958279cf23f.
Change-Id: Ied9bd9188e719657228a53b7a7f1baca86c1bd71
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Linux file systems are case-sensitive while Windows file systems are
usually not. That results in build errors when includes or libraries
are incorrectly cased. Such errors wouldn't be noticed on Windows,
but only when cross-building Qbs with MinGW on Linux.
Change-Id: I3a340f907deaaf75b91369330d35918d70de56ca
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It appears, that destruction of complex QHashes/QLists took a bit time
in refcounts. Optimize them by using std::unordered_map and std::vector
instead. Plus, make structure simplier, instead of 2 hashes, use pair as
a key.
qbs::Internal::ProjectBuildData::~ProjectBuildData()
Before: 11.00 ms 0.1%
After: 6.00 ms 0.0%
Change-Id: I82d8bec5a465210cfa54762088f47c606c0e48e5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Move static functions out of anonymous namespaces
Change-Id: Iae6d13189b716e47b21f4c11e1c337487f78fad5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Makes clang-tidy happier
Change-Id: Ic29b552572719ea58c7ad385cc6e1d68cef9eedc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Makes clang-tidy happier
Change-Id: I75f3b6409b425b9a7054d7886ab0160a040b25d5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QLists were used with types that bigger than sizeof(void*) which lead to
extra allocations
Change-Id: Id716c6b4919f9a0ad62e1d2972319a600785afc5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Makes the Ir event count go from ~8.28 billion to ~8.12 for a
Qt Creator null build.
Change-Id: I02714cd922fd9d42abe67e5115e3ffd64778f77a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Now the KEIL compiler path also extracts from the Windows
registry in addition to the path feature
Change-Id: I8a92233ff58119ea7c3cc40e6da95408e0ced1ba
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Now the IAR compiler path also extracts from the Windows
registry in addition to the path feature.
Change-Id: I77d2cc13924afac751445df98ea60f1f62f9d892
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Now the SDCC compiler path also extracts from the Windows
registry in addition to the path feature.
Change-Id: I84148e464696fdfffc6342d22baa1d75c6caa0ce
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Is:
text data bss dec hex filename
11490 8 0 11498 2cea itempool.o
Was:
text data bss dec hex filename
12425 8 0 12433 3091 itempool.o-orig
Also, less symbols.
Change-Id: I6f90b126933f5fa6d00f5e1097faaa4276613a6a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ic02d717f80f5d831f0cedb3b7c565a9bfef3a2a3
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It seems, that QSettings is not working properly with SystemScope on
Macos (QTBUG-21062). QSettings::fileName returns a path to a file in a
test directory, not in "/Library/Application Support" as expected. Thus,
canWriteToSystemSettings is true and test fails when real qbs binary
tries to write to the /Library... location
Change-Id: I726360a1daacf4871f944f5afe30089083283dce
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ic885bba12107b2a9f116dd8a33f1cad12ced1764
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This makes move ctors and destructor trivial
Change-Id: Ifee00b7526fd1564fcf01f799230997f929b29db
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I6619817f8c87e9f643f7f1b6d2851799de439782
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1427
Change-Id: I46e1dab6baf964a7f42fe96a3fb3be37cf6e692f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I6a20f4475b52858f79c98b5ce3dd088aac7bc46e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Missing override is a warning in clang
Change-Id: I90b899df37e690aebb942bffc65db54d9aa4050f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes most of clang analyzer warnings about uninitialized variables
in ctors
Change-Id: I879c785594307ed3fe7140588338a6b2a1e4db65
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ife9f7cd99dd5a531bcb670b2dfbd245471a8c379
|
| |
| |
| |
| |
| |
| |
| | |
remove \r\n or \n from the qmake query output not just \r or \n
Change-Id: I4cd12fb5e708b28eedc43381a8d67f9e54c82d9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Apparently, windeployqt copies all resources into the directory of the
first binary it encounters on the command line. So make sure that binary
is qbs.exe and not one of our plugins, as we want the libs to end up
under bin/.
Change-Id: Ib23f1b355a058ca1deec5e10535c68dc9170a2bf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I48e8efd18b026e2d8f58e2ae2ddc60b67c9acf68
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Now we have automatic Qt detection, and that set is not needed anymore.
Change-Id: I9c01dad173ac70cbeaab64b412255057d7ce8cbd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I5e70d75f2495fe5e265ddb5ab3e4a2628c5ebd54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Qt Creator uses non-latin letters in path to the build directory in case
of ru_RU.UTF-8 $LANG on Linux. Now QBS does handle that correctly.
Change-Id: Ifc727b120a5f0ee60972c5e3ed24067426db8df2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit adds a basic support for the SDCC compiler:
* http://sdcc.sourceforge.net/
As this compiler support multiple architectures, then it is impossible
to uniquely identify the current architecture by dumping of the
pre-defined macros (because its content depends on a target flag). In
this case the cpp.architecture will contains a default architecture
(which is dumped with an omitted target flag).
To use it with Qt Creator, it is enough to add there a desired Kit
with a custom SDCC C/C++ compiler, and then set the following in the
Kit's Qbs profile settings:
* Key: qbs.toolchainType
* Value: sdcc
To create the SDCC profile it is enougth to use the following
command:
qbs setup-toolchains --type sdcc <path/to/sdcc/compiler/binary> <profile
name>
A toolchain type can be omitted; in this case the QBS will
tries to detect the toolchain type from the specified compiler
name.
Also it is possible to auto-detect the SDCC toolchain from the
PATH environment using the following command:
qbs setup-toolchain --detect
At current time are supported only the 8051 (aka MCS51) architecture;
other architectures can be added later.
Change-Id: I8cc239d62e35472ab667e054a64a1e59c2d548bd
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1316
Change-Id: Ibf9da364610c260ead088a8990a70c7739d53c39
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I0678ef8cf6f81489914e79be903ca4d4c1cebada
|
| |
| |
| |
| |
| |
| |
| | |
MSVC 2017 starts at 19.1, not 19.10.
Change-Id: Ib65d36ca19af829c8e616f40db6bcb11d9b288f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The version number for recent MSVC2017 installation has changed to the
format \d+\.\d+\.\d+\.\d+ and the second number is not guaranteed to be
a zero.
Change-Id: I13728d2a5ea3162c3ff29558757cd576a83f4983
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
None of them really necessary or even desirable to fix, but...
tools/launcherinterface.cpp:114:80: warning: ‘void QProcess::finished(int)’ is deprecated:
Use QProcess::finished(int, QProcess::ExitStatus) instead [-Wdeprecated-declarations]
api/projectdata.cpp: In function ‘QString qbs::mapToString(const QVariantMap&, const QString&)’:
api/projectdata.cpp:882:15: warning: ‘void qSort(Container&) [with Container = QStringList]’
is deprecated: Use std::sort [-Wdeprecated-declarations]
parser/qmljsparser.cpp: In member function ‘void QbsQmlJS::Parser::reallocateStack()’:
parser/qmljsparser.cpp:72:104: warning: ‘void* realloc(void*, size_t)’ moving an object of non-trivially copyable type ‘class QStringRef’; use ‘new’ and ‘delete’ instead [-Wclass-memaccess]
etc.
The QStringRef is the only one theoretically applicable, but isn't in
practice given the current implementation.
Change-Id: Idb2a03e3fd096b6ad428615f81266f952d2a8d95
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Don't move into reference. Amends 936eee744d.
Change-Id: I7fa4e32f2d9f340f881cc746b74a752f81d34918
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|