aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-12-201-0/+0
|\| | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/projectexplorer/kitinformation.cpp Change-Id: I94299b069418586db97d1d596a252794e4037556
| * Update qbs submoduleChristian Kandeler2016-12-161-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: I77f56ba1b6cf7c23a9cdc3cc2e90cb8a2c6cbeb3 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-12-091-0/+0
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/ios/iosdevice.cpp src/plugins/ios/iossimulator.cpp src/plugins/projectexplorer/projectwindow.cpp src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp src/shared/qbs Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
| * Update qbs submoduleChristian Kandeler2016-12-091-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: Ifde10cab3dd3f93cd95a2cb72a9017866683802a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Update qbs submoduleOrgad Shaneh2016-12-061-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: I882be8dad05ffcd9a2f3f0c78b278bb5d94b985b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Update qbs submoduleChristian Kandeler2016-12-021-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: Ic47bfa33e826cded51369fbd35572f0d7d5cca6f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Update qbs submoduleChristian Kandeler2016-11-251-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: I2d1336c8332684b902c8e999b5e5b14afeebd7de Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Update qbs submoduleChristian Kandeler2016-11-211-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: Idf6d30689e5a0a142c812d90fc79e6dc6f6445dc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Clang: Avoid passing unknown optionsChristian Stenger2016-12-081-0/+1
| | | | | | | | | | | | | | Option -Werror=date-time was introduced in gcc 4.9 Change-Id: I5be2100a2dc0a37d6a2e8c7b5c40f18bcdb0d3ac Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Clang: Filter unwanted clang flagsMarco Bubke2016-12-071-0/+6
| | | | | | | | | | | | | | We maybe need to extend the list. Change-Id: I4615467a95985df9f6d0128223fb1aaad2561880 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Clang: Add flag to disable Clang LibToolingMarco Bubke2016-12-071-3/+9
| | | | | | | | | | | | | | | | | | | | Because of C++ linking problems we introduce QTC_NO_CLANG_LIBTOOLING as a workaround to disable Clang LibTooling. Use QTC_NO_CLANG_LIBTOOLING=something to disable it. Change-Id: I2dc9947d69d94292e08dacb1558bef56f5ebbbe3 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Clang: Use llvm_config --cxxflagsTim Jenssen2016-12-071-1/+1
| | | | | | | | | | | | | | | | | | Using llvm_config --cxxflags can be potential dangerous. We should test every configuration if it is compiling. It has the advantage that we don't need to care anymore about incompatible flags to the used clang version. Change-Id: I3bbddb1935dca9896c64ebafd1fbe72840db8bd4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProParser: Use the "Default Codec" when reading qmake filesAlessandro Portale2016-12-012-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a QTextCodec* member to QMakeVfs. It is used to decode the qmake file contents in QMakeVfs::readFile. The QMakeProjectManager sets it to the current "Default Codec". This is necessary only in Qt Creator, where the parser would actually use Local8Bit (unlike qmake's Latin1), which would sometimes lead to misinterpreted multi-byte chars in comments swallowing newlines and thus falsifying the actual code. Bootstrapped qmake is not affected by this addition. Task-number: QTCREATORBUG-17309 Change-Id: I34b42bd19e0de973deb2291e91f306d1ca7c630e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Clang: Extend clang queryTim Jenssen2016-11-231-0/+0
| | | | | | | | | | | | | | It's a first step to introduce clang query. Change-Id: I4d001a8883f56066765ce6bc561fa3f49611c0a4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-11-161-2/+2
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/clangrefactoring/refactoringengine.cpp src/tools/clangrefactoringbackend/source/symbolfinder.cpp Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
| * Clang: Require LLVM >= 3.9.0Nikolai Kosjar2016-11-151-2/+2
| | | | | | | | | | | | | | | | We already ship with a cherry-picked change from version 3.9. Change-Id: Iad09ac8db470506c5de0321f3a2346c549b11b31 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Clang: Add clang queryTim Jenssen2016-11-151-2/+3
| | | | | | | | | | | | | | | | | | Clang query is mechanism to use AST matcher to search for code. Think about regular expression but in the context of AST. So you get a semantic search tool for C++. Change-Id: I72e882c5b53a0c52f352a3664847c4c3e4f6fc2e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-141-0/+0
|\| | | | | | | Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
| * Update qbs submoduleChristian Kandeler2016-11-111-0/+0
| | | | | | | | | | | | | | To HEAD of 1.7 branch. Change-Id: I08cb96bba1aa5a8b821e7be354aaa3af71c0c2aa Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-0214-123/+274
|\| | | | | | | Change-Id: Ibb932efece05a5f5613823fbc79c5b7601c73905
| * de-duplicate INSTALLS resolutionOswald Buddenhagen2016-11-012-20/+19
| | | | | | | | | | | | | | | | don't resolve the source files once for deployment and once for the project tree. Change-Id: Ifddf8fc7883bf025d3640de0d6676b5930991088 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * remove duplicate resolution of sources from cumulative passOswald Buddenhagen2016-11-012-2/+8
| | | | | | | | | | | | | | | | | | instead of resolving all sources both in the exact and the cumulative pass and de-duplicating the joined list in the end, resolve only these files from the cumulative pass which are unique to it to start with. Change-Id: Ie3327799ecd94f8710f8b99bcc46998790ba2c74 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * de-duplicate resolution of exact sourcesOswald Buddenhagen2016-11-012-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than resolving them once in bulk (for the code model) and once per pri file (for the project view), resolve them only in bulk, but "tag" them. then do a cheap filtering pass for the project view. as a side effect, this fixes the problem that sources that are listed by a file that is not shown in the project tree (as is the case for qrc files synthesized by resources.prf) would not be shown at all. instead, these sources now appear belonging directly to the pro file. Task-number: QTCREATORBUG-3670 Change-Id: I1a1756d95bd90db4da1274eebcc4dad2a854f43d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * unify {,obj}c++{source,header} handling in qmake project managerOswald Buddenhagen2016-11-014-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistently with Xcode, qmake nowadays knows only one SOURCES list, which is automatically classified by extension. to replicate that, we actually copy the objective_c.prf file from qt 5.6.3 and use it to override whatever comes with qt, so we can treat all qt versions uniformly. also, the code model throws away the information which files were listed as sources and which as headers. this is technically incorrect, as a source may be only included rather than compiled, but there is no point in extracting information which is not used. conclusion: lump all c-like sources into one variable as far as project processing is concerned. and as far as configuration goes, our code model doesn't differentiate anyway, so the duplicated setup paths can be eliminated as well. Change-Id: I24b1bc056f8d9eb579c9378817f602912ab49971 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * make VFS aware of exact vs. cumulative evaluationOswald Buddenhagen2016-11-018-47/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the cumulative evaluation has a good chance to make a mess of the virtual file contents created by the exact parsing, so better contain it to its own namespace. the ProFile cache also needs to keep the files separate. this specifically addresses the side issue discussed in QTCREATORBUG-10779. it also fixes attempts to deploy the wrong build when the variant is selected through a cache file, as in QTCREATORBUG-15815. in the project explorer, we don't track from which evaluation pass particular files came from, so we try the cumulative first to get the most contents, and fall back to the exact one if the former file is empty (or does not exist at all). Task-number: QTCREATORBUG-15815 Change-Id: I2c1eb16c97526fa275a1c6a2eae9266d385859ac Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * shave off duplicate stat()ing of source filesOswald Buddenhagen2016-11-013-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | ProFileEvaluator::absoluteFileValues() now returns only files, which allows us to skip the subsequent QFileInfo::isFile() calls at some call sites. as a side effect, IoUtils::fileType() does not see anything except regular files and directories any more. that's not expected to be a problem, given the function's scope. Change-Id: I53063ad8cacb3afe5cc1baf6d6d5feba3465e74f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * let QMakeVfs::readFile() report ENOFILE explicitlyOswald Buddenhagen2016-11-013-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | when the QFile object is already constructed, querying whether the file exists is actually cheap, so do it right away instead of later on demand. that makes the calling code a bit cleaner. fwiw, that we need to explicitly query the file's existence at all is a result of QFile's completely useless error "codes" (which merely say which function failed, as if the caller would not know). Change-Id: Ifec39d05b1713d8128046f679287e510f10e45dc Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * make resource file handling able to deal with QMakeProject's VFSOswald Buddenhagen2016-11-014-7/+29
| | | | | | | | | | | | | | | | resources.prf may create virtual qrc files when RESOURCES contains non-qrc files. Change-Id: If591de9b32b775059d67e94bc3cb06d23ee44b08 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * chuck sysroot handling out of ProFileEvaluatorOswald Buddenhagen2016-11-013-35/+11
| | | | | | | | | | | | | | | | | | | | | | | | qmake doesn't do anything with sysroots at this level, so this code plain does not belong here. sysrootification is used when resolving INCLUDEPATH, which is emulating compiler behavior. this is done by higher-level code. Task-number: QTCREATORBUG-11944 Change-Id: Ia25f0b6ef713e9809d974e3f3e49ba308b8c933f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * introduce ProFileReader::fixifiedValues()Oswald Buddenhagen2016-11-012-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and use it for PRECOMPILED_HEADER, INCLUDEPATH, and install target collection, instead of abusing ProFileReader::absoluteFileValues(). specifically, this falls back to a location in the build directory when the path is relative and the file cannot be found. in qmake, this somewhat weird behavior ensures that chaining extra compilers actually works (and also ensures a lot of frustration with non-clean source dirs ...). this also fixes INSTALLS with .CONFIG no_check_exists. Task-number: QTCREATORBUG-14848 Change-Id: Iaf9483c0c4586c464bd10a2aea7cbac7e0df1ec5 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: use a pri file to set clang definesTim Jenssen2016-11-011-0/+3
|/ | | | | Change-Id: I52167ab3ce480c795cb0f0bcd749f97b34db86d3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Update qbs submoduleChristian Kandeler2016-10-311-0/+0
| | | | | | | To HEAD of master branch. Change-Id: I8aff6a4685fc5f900037e5703b6c2f00b1996ff4 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make message about not found mkspec less confusingOswald Buddenhagen2016-10-251-1/+1
| | | | | Change-Id: I9cfa2c9476d3d7fdb68b0a23e175eea4b3b11ad9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* add discard_from() functionOswald Buddenhagen2016-10-253-5/+45
| | | | | | | | | | this function discards all values that come from a specific file. it will be needed for configure bootstrapping, but is too obscure to document it for general use. Change-Id: I62c18aeb1847712e33d0599dbb0b90ffa1722438 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/12bb328bb0be8efe54aae750c21938aab4d17539)
* add support for returning the command's exit status to $$system()Oswald Buddenhagen2016-10-252-6/+17
| | | | | | | | ... and make use of it in qtRunLoggedCommand(). Change-Id: I242dfde344f555800cef1f55d3cb85418a93277f Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/0eff800e81f3e7f803dffd77737faaed73002ac8)
* print no message at all when no argument is supplied to error()Oswald Buddenhagen2016-10-251-1/+1
| | | | | | | | | this is useful when an adequate message has already been emitted by other means, like various built-ins do. Change-Id: I092771f55969fad8b214204d666327664727c572 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/22d1351ddea193f5c00d4ae12229358dea826c62)
* Update qbs submoduleChristian Kandeler2016-10-191-0/+0
| | | | | | | To HEAD of master branch. Change-Id: I5b15266209328623f8df86102481ee9e06ab8fdc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Utils: Unify the different Bookmark iconsAlessandro Portale2016-10-112-6/+2
| | | | | | | | | The variant in Bookmarks was left aligned, which is obsolete due to the textmark overview tooltip. Bookmarks and Help now use the same icon which is in Utils. Change-Id: I0f7899de2f7a8803aa8493659d2991ac13739144 Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2016-10-051-0/+0
| | | | | | | To HEAD of master branch. Change-Id: I19f4f28968655797e5aa11ff0f9489f337080f04 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Clang: fix llvm lib linking on windowsMarco Bubke2016-09-191-2/+3
| | | | | | | | If we use paths with spaces we cannot split them anymore so we have to handle unix and windows differently. Change-Id: Ibfc8c51cfe2ecd68e913ad84e0e1269eb7eeda02 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Clang: Remove unused libraryMarco Bubke2016-09-051-1/+1
| | | | | Change-Id: Ia5031feee2be57bf5a0ac9d3f21e6010e5136afa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Clang: Report an error if the unit test are linked with LLVM without RTTIMarco Bubke2016-09-051-0/+2
| | | | | | | | | We don't want to disable RTTI in unittest so we require to compile them with RTTI. You can disable yourself RTTI if you don't want them for some reasons. Change-Id: I76d05a36442305f379ce3d88b3f6ed4372127002 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Update qbs submoduleChristian Kandeler2016-08-221-0/+0
| | | | | | | To HEAD of master branch. Change-Id: Ic6817c3735dc5718bfaf6109f8eb4a9ac11e876c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Clang: Disable RTTI for refactoring backendMarco Bubke2016-08-111-1/+1
| | | | | | | | | LLVM is normally not compiled with RTTI so we get link errors. We should use "llvm-config --cxxflags" but before we can use it we should be sure that we don't break something. Change-Id: If45afcd625273230960a2c2065877f2512a53209 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Add defines for llvmMarco Bubke2016-08-111-0/+2
| | | | | | | | Actually we maybe should use llvm-config --cxxflags but before we do that we should evaluate possible compile breaks. Change-Id: I534605c6f61217bfe985bef22af7d1dc9ac79637 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submoduleChristian Kandeler2016-08-111-0/+0
| | | | | | | | To HEAD of master branch. Also do the necessary API adaptations in QbsProjectManager. Change-Id: I4709b7a0f35537f5b6f9fd04f4d95be16aef2c8d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Clang: Fix check for libclang on macOSEike Ziller2016-08-081-1/+1
| | | | | Change-Id: I8a81905b1fad9155824226f16103cf22ae625429 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Clang: Fix detection of clang libs on macOSChristian Stenger2016-08-081-1/+1
| | | | | | | Broke with 4cdb5bab157bfec52ece3a2ed6dd1ace82f80265 Change-Id: I84e54f12f632b87694f9a3e93824558f0098e40b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-08-0513-241/+506
|\ | | | | | | Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
| * Improve error reporting when parsing JSON filesLars Knoll2016-08-022-3/+9
| | | | | | | | | | | | | | | | | | | | | | At least report the error string and the file offset where the error happened. Change-Id: Iaa1733593b8af2a7a52b67c0f495731f045d2c11 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/34c24ceb1ffce964c9f139d84b6b271bd2e45c33) Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 16:41:16 +0000