aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup/qtprofilesetup.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Do not use fromLocal8Bit() for string literalsKai Koehne2016-11-081-1/+1
| | | | | | | | | | The current locale encoding does have nothing to do with string literals. Use fromLatin1(), which tends to be the fastest for ASCII. Change-Id: I9f1ff603f26812a63e5b23a413ba240c47d5ac23 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add support for the QtScxml moduleChristian Kandeler2016-10-201-0/+2
| | | | | | | [ChangeLog] Added support for QtScxml module. Change-Id: I1ad8d51a3d9532d4a24270e4cc13f26f51620b07 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Update license headersIikka Eklund2016-08-291-14/+23
| | | | | | | | | | Patch-set 2 includes *.cpp *.c Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ie6e493097af6f7dd6a8adff170eb856f496e689e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Extract toJSLiteral functions from scripttools.{h|cpp}Joerg Bornemann2016-07-061-1/+1
| | | | | | | | | The toJSLiteral functions do not use QtScript and are needed by libqtprofilesetup. This extraction is needed to remove the QtScript-dependency from libqtprofilesetup in a subsequent commit. Change-Id: Ide1737269d4b98f38eee93cdf9b6c33a6967c91c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Do the OS X to macOS rename.v1.5.2Jake Petroules2016-06-271-7/+7
| | | | | | | | | | | | | | | | | [ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been replaced with "macos". For backwards compatibility, qbs.hostOS will still contain "osx" in addition to "macos", and an error will be printed if qbs.targetOS contains "osx" but not "macos". Specifying "macos" without "osx" is allowed. These checks are subject to be removed in a future version of qbs, so update your hostOS and targetOS checks accordingly. [ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed in a future version of qbs, so update your projects accordingly. Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Replace 'the Qt build suite' with 'Qbs' in copyright notices.Jake Petroules2016-06-061-1/+1
| | | | | | Change-Id: I885d94bb14b325dc36767a840ebdb0be1fb59dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* DBus module: Add support for the qdbusxml2cpp tool.Christian Kandeler2016-04-271-0/+4
| | | | | | | | This brings feature parity with qmake regarding the (undocumented) DBUS_ADAPTORS and DBUS_INTERFACES variables. Change-Id: I6c7a2278308e5eb44b4582f33615100def21d84c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Remove deprecated properties.Christian Kandeler2015-08-311-1/+0
| | | | | Change-Id: I961bdece8fc284dd102ce443646e06cdd54660d6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Have one instance of qbs settings per qbs version.Christian Kandeler2015-08-241-1/+1
| | | | | | | | | | | | So that one can switch between versions without having to regenerate profiles every time due to possible incompatibilities. Note: We do not try to magically make old settings work with new versions; if incompatible changes have happened, users still need to re- run tools like setup-toolchains or setup-qt once. Task-number: QBS-527 Change-Id: If8d0015e849ad573a0ed79f624bcd60731244e03 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use BlackboxOutputArtifactTracker for qdoc.Jake Petroules2015-08-051-0/+2
| | | | | Change-Id: Ie5b2eb70cd371287820dcc180ff3e21682ae062f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* qtprofilesetup: Fix check for static Qt.Christian Kandeler2015-06-181-2/+3
| | | | | | | | | | | | | | | On Windows, the DLLs are in the BINS dir, not in LIBS. The reason this seemed to work so far is that the Qt packagers randomly put the DLLS into the LIBS directory for certain releases. For instance: Qt 5.4.2/MSVC: no Qt 5.4.2/MinGW: yes Qt 4.8.7/MinGW: yes Qt 4.8.6/MinGW: no Fun! Task-number: QBS-825 Change-Id: Ic717ced8b3c2269a8e4cc318704bd5ec7c7adadd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix setup-qt for static builds of Qt4Joerg Bornemann2015-05-191-3/+3
| | | | | | | | Treat every Qt4 module as static library if the Qt build is static. Change-Id: If31f45c775aab583a0bfb68345c9d5b977d8de97 Task-number: QBS-804 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Prevent automatic casting from char* to QString.Christian Kandeler2015-04-231-22/+24
| | | | | | | | | | Reason 1: Internationalization. Reason 2: Performance issues due to inadvertant QString instantiations in hot code paths. Task-number: QBS-780 Change-Id: I37c740dd828e11c5b0000a0dd472a519d032d71c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* update license headersJoerg Bornemann2015-03-021-2/+2
| | | | | Change-Id: I36d825db3a5ef32c162c3063aab1e8a1f2696f4f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Merge branch '1.3' into 'master'Christian Kandeler2015-01-281-6/+6
|\ | | | | | | | | | | | | | | | | Conflicts: doc/reference/jsextensions/jsextensions-general.qdoc src/lib/corelib/language/evaluatorscriptclass.cpp src/lib/corelib/language/evaluatorscriptclass.h Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
| * Update LicenseEike Ziller2015-01-261-6/+6
| | | | | | | | | | Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | qtprofilesetup: Fix minimum OS X version setting.Christian Kandeler2014-12-191-1/+1
|/ | | | | | | We have to check QT_CONFIG, not CONFIG. Change-Id: I512e1e1c78107b7fa1d2d4d88b79997a14bf3021 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* set up entry point libs in Qt.coreJoerg Bornemann2014-10-271-1/+32
| | | | | | | | Let the Qt profile setup write the entry point libs to Qt's core.qbs. Also, add shell32.lib to MSVC if we have a Qt >= 5.4. Change-Id: I8ade1141101ac7494031ad49e78ba63be0342f03 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* License update.Eike Ziller2014-10-161-7/+8
| | | | | | | Add LGPLv3 option. Change-Id: I8a63ad5e46a2701032b2103f791df4dec5b707e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make Qt build variants logic more sensible.v1.3.2Christian Kandeler2014-10-071-1/+2
| | | | | | | | | | We no longer force the Qt build variant to match the build variant of the application linking against it (except for MSVC, where that is required). Change-Id: Ie2c80fbb0d688cdcbab57ad638aaccbbd6988a22 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Link Qt libraries as full file paths.Christian Kandeler2014-08-201-0/+2
| | | | | | | | | | | | | | | | That is, give the full file path to the linker instead of using the -L/-l combination that can pull in the wrong version of a library if one is installed e.g. in /usr/lib. For this purpose, the patch does two things: 1) In each Qt module file, add the file path of the respective library to cpp.{static,dynamic}Libraries instead of the base name. 2) When reading Qt's prl files, check in all occurrences of "-l<lib name>" whether <lib name> matches a Qt library and if so, replace <lib name> with the full file path to the library. Change-Id: Ic02633ae7f820bd2365f8e510f7c16f73d93e584 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* rename QtModuleInfo::moduleName to moduleNameWithoutPrefixJoerg Bornemann2014-07-171-1/+1
| | | | | | | ...because that's what it returns. Change-Id: Ie0c8f27ea1d6b686fc1f825dbc8b42c56f1a7b68 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove unused property qtModulePrefix from Qt modulesJoerg Bornemann2014-07-171-5/+0
| | | | | | | | This was used to calculate include and library names. That's done in setup-qt now. Change-Id: Ief2b17e9fdf65e829dc563dac49e70d8dcbaebee Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qtprofilesetup: Only copy module files if necessary.Christian Kandeler2014-07-161-66/+76
| | | | | | | | | To get rid of unnecessary project resolving due to time stamp updates. This is particularly relevant for Qt Creator, which often calls this code for no reason. Change-Id: Ic28464fa470c79efb800800ddb4f1c368d1e527d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Gather information about Qt plugins.Christian Kandeler2014-07-111-0/+32
| | | | | | | | And create modules for them. These also handle the creation of the "import" source file when building against a static Qt. Change-Id: I883a1dd96c5e38c9d4bb5c13af807b1bf388f8b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Set up ios-specific flags at setup time.Christian Kandeler2014-07-081-1/+0
| | | | | | | | This enables us to get rid of qtfunctions.js. Change-Id: I4cf593742f7afcfb9caa8e2984b11b80d4fb6265 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qtprofilesetup: Determine Qt module library name at setup time.Christian Kandeler2014-07-071-0/+4
| | | | | | | | As opposed to calculating it in JavaScript inside the module. Change-Id: I4d11d57a45098d7f8ac06cf60f8d8cab8b11feab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Take prl files into account.Christian Kandeler2014-07-041-0/+11
| | | | | | | | | | That is, extract libraries, frameworks and other linker flags from QMAKE_PRL_LIBS and add set the respective properties in qbs' Qt module files accordingly. Task-number: QBS-618 Change-Id: I404a3c07af6fdebb8e2862fefd5696aada7a58e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Split up qtprofilesetup.cpp.Christian Kandeler2014-07-031-311/+6
| | | | | | | | | It's gotten unruly. Move QtModuleInfo into its own set of files and move some code into new member functions. Also move the module list generators into that file. Change-Id: If87269cc509c730084257ac4f254def529e43b5b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* read Qt.core defines from Qt buildJoerg Bornemann2014-07-031-3/+9
| | | | | | | | | We now read the defines needed for Qt.core from the Qt build instead of calculating them. This also enables us to remove the namespace property from Qt.core. Change-Id: I92bb20f3677eb2012a390f93cb2f047c616e7429 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix parsing of Qt modules .pri files.Christian Kandeler2014-07-031-4/+6
| | | | | | | Somewhat unsurprisingly, there can be more than one '=' on a line. Change-Id: I7d45d3230edf5a722f2effa1f988d2b590c8303f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Move module list generation into dedicated functions.Christian Kandeler2014-07-031-202/+213
| | | | | | | | Makes it easier to see what is actually going on in the createModules() function. Change-Id: I9a81140df4796084e9c2ff74c192b271ee5139eb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* revisit how Qt compiler defines are set upJoerg Bornemann2014-07-021-4/+25
| | | | | | | Move the logic from QtModule.qbs to libqtprofilesetup. Change-Id: Ie0a19cb5da996dfbf76c4ae09416fdcc54e52b27 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix Qt4 include paths.Christian Kandeler2014-06-191-4/+8
| | | | | | | | Things like #include <QtCore/QObject> don't work anymore since the latest refactoring. Change-Id: Ic8cbc743c8799cfe92307667f1f7fff77bdd0b69 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* beautify string template syntaxJoerg Bornemann2014-06-181-5/+5
| | | | | | | | | | | | Instead of the less common syntax ###some key value it's @some_key_value@ now. Change-Id: Ic3b763b5d0828aaa22af6f05b55e8ede80fb47f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* revisit how Qt includePaths are set upJoerg Bornemann2014-06-181-53/+111
| | | | | | | | | | | Remove code to calculate include paths from QtModule.qbs. There's no point in doing that on every module evaluation. Instead the setup-qt tool writes the full list of include paths to the generated module files. Task-number: QBS-612 Change-Id: I2919770df06dd2efcbfad4cb482b8c837de6a932 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* use toJSLiteral in setupQtProfileJoerg Bornemann2014-06-161-20/+16
| | | | | | | | Remove duplicated code to convert Qt datatypes to JavaScript literals. Change-Id: I5dac447648f6d3ec05be254c6d5ae8a3ed3665b5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-051-3/+10
|\ | | | | | | Change-Id: I6cec75208dec6d45172b00e9b36c845b095b8ac3
| * read QtModuleInfo.isStaticLibrary from module_configJoerg Bornemann2014-06-041-1/+6
| | | | | | | | | | | | Change-Id: Ia37b245cac5479e2c846b7079f51f548b04f82b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * initialize QtModuleInfo::isStaticLibraryJoerg Bornemann2014-06-041-1/+3
| | | | | | | | | | | | Change-Id: If90fd697cbcfcd1eda6f24cb7ac7ad2985e4df68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Fix messages.Takumi Asaki2014-06-021-1/+1
| | | | | | | | | | | | Change-Id: Ie06e48637ea0bb10e2383f75c6a33488c275a29a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-021-4/+35
|\| | | | | | | | | | | | | | | | | Conflicts: qbs_version.pri share/qbs/modules/cpp/GenericGCC.qbs version.js Change-Id: I77e3d22cdc6f95bfa83c64a7fcfde735c6393d10
| * setup-qt: mark ActiveQt libs as static for Qt4Joerg Bornemann2014-05-261-1/+9
| | | | | | | | | | | | Task-number: QBS-598 Change-Id: I2c453da06b927b120bcdfbecc369bb8063d27fe6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * setup-qt: fix module prefix for ActiveQtJoerg Bornemann2014-05-261-2/+15
| | | | | | | | | | | | Task-number: QBS-598 Change-Id: I3c722239bf51317e55a028680c03c31629f5ed0b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * setup-qt: fix module name for ActiveQtJoerg Bornemann2014-05-261-1/+11
| | | | | | | | | | | | | | Preparation for fixing QBS-598. Change-Id: I039d3276eddf0eaf047b1b50f72d5b1976a47152 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-05-161-0/+2
|\| | | | | | | Change-Id: I19d714d5c860268aaed6d7b6cf254c0b55b159c6
| * Fixed handling of Qt4 Phonon submodule in qtprofilesetup.Thomas Epting2014-05-161-0/+2
| | | | | | | | | | | | | | | | | | Considered the different naming conventions of the Phonon module and associated paths and libraries (Phonon vs. QtXxxx). Change-Id: Iedf7501b35685f30379a8145440fc751a6cde91d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | introduce Qt.quick.qmlPath propertyJoerg Bornemann2014-05-161-0/+6
| | | | | | | | | | | | Task-number: QBS-578 Change-Id: I116987d3232a832137781d4d5ac90adf4bd7ed88 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | introduce Qt.quick.qmlImportsPath propertyJoerg Bornemann2014-05-161-0/+10
| | | | | | | | | | | | Task-number: QBS-578 Change-Id: I09a4396f48e40f78b665564691a2bc3eebcc77f8 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | facilitate QTextStream for writing Qt.quick propertiesJoerg Bornemann2014-05-161-3/+6
|/ | | | | | | This will simplify the next patch. Promise. Change-Id: Ib9ade1e2df705d6d850b368706969d68644b62a8 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 01:32:38 +0000