summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* build: Fix the FreeBSD build due build system change.Holger Hans Peter Freyther2012-08-141-1/+1
| | | | | | | | | Revision 6f4ff81380862ad0e788151b35d742f548241d5a broke the QtDeclarative build. FreeBSD's ld.so is using the LD_LIBRARY_PATH environment variable as well. Change-Id: I0a91cedfb9d1935a08d348212f5ff1a54bfe3e53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* support -rpath for modules which are not installed to QT_INSTALL_PREFIXOswald Buddenhagen2012-08-112-0/+10
| | | | | | | | | | | | | a module's project file may set MODULE_INSTALL_LIBS before loading qt_module.prf to have an alternative RPATH linked into the users of that module. this is relevant only for linking against non-installed -prefix builds of that module, as otherwise .libs from the module's pri file is used for rpath. Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix -rpath-link handling for non-installed prefix buildsOswald Buddenhagen2012-08-113-7/+55
| | | | | | | | | forwarding module pris get rpath_link{,_private} fields, which are used accordingly by qtAddModule(). Change-Id: I0abc2dc8b1e8744dbf7f439aa7fed9ae159c2c74 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qtAddModule(): put search paths directly into LIBS{,_PRIVATE}Oswald Buddenhagen2012-08-111-7/+12
| | | | | | | | | QMAKE_LIBDIR and QMAKE_FRAMEWORKPATH have the downside that they always effectively end up in LIBS, which makes for weird prl files. Change-Id: Iaf61b0038504ff91ae5ec7f9b1255fe3a2d134f1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* assemble the complete tool commands already in qt_tool.prfOswald Buddenhagen2012-08-112-27/+25
| | | | | | | | this saves some repeated calculations. also, it's nicer to have most logic in one place. Change-Id: Iea362d40f5e6203709ced94d29ca61a4163b8e69 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix error message about bad qt modulesOswald Buddenhagen2012-08-111-1/+1
| | | | | | | the variable name is a function parameter now Change-Id: I46f3ce37c157312e7f70291a0cef2d666d50664c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix vcproj file generation for incredibuild handling of moc etc targetsAndy Shaw2012-08-111-1/+2
| | | | | | | | | | | | | | When incredibuild-xge had been turned on by configure then it was not ensuring that the generated vcproj files had the right extra comments needed to make incredibuild run moc and other tools in parallel. By fixing the prf file to get around a problem in the parser this is now respected. Task-number: QTBUG-14482 Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix conditions in embed_manifest_*.prfJoerg Bornemann2012-08-092-2/+2
| | | | | | | MSVC 2012 was ignored. Change-Id: I41b2dff85c037ce8057c91036434aa26cd9b5d5c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update Raspberry Pi mkspecDonald Carr2012-08-091-7/+7
| | | | | | | | | | Hard float enabled Raspbian image is now primary platform provided by the Raspberry Pi foundation. Change-Id: I2d59ad26fac459907b4f51764975a3e6e29c6033 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Make it possible to force generation of debug info in release buildsAndreas Holzammer2012-08-091-3/+9
| | | | | Change-Id: Ie79e5a6a87475d5140163a2a547b4385a53fc05f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove unused Q_FS_FAT from Windows qplatformdefs.hJoerg Bornemann2012-08-084-4/+0
| | | | | Change-Id: I12a70c8a06fa5d82db1cb3d6e6a7ed870e7a8ec5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove embed_manifest_* from common Windows CE mkspecJoerg Bornemann2012-08-081-1/+1
| | | | | | | | They had no effect anyways due to the check in the embed_manifest*.prf files. Change-Id: I3cd145030876d91948794d376a18a47e297f3b3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* adjust qtAddLibrary() to new qtAddModule() parametersOswald Buddenhagen2012-08-081-1/+1
| | | | | Change-Id: Ib5918fa83e78d16fd318590c33b280d9054b2cd6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* rename qt_module_config.prf => qt_module.prfOswald Buddenhagen2012-08-083-240/+240
| | | | | | | this is more logical, following the qt_plugin and qt_tool scheme. Change-Id: Ib3b2abec6728cdab260e15128b1cd78e8e6f5d6a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove dead unsupported/win32-borland specOswald Buddenhagen2012-08-082-285/+0
| | | | | | Change-Id: I010160f030dc44c84d2c84a36e8920ce3275f278 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* preserve the directory structure of QML_FILESOswald Buddenhagen2012-08-081-1/+6
| | | | | | Change-Id: I39ccdbf59887f14be7dad492598160eebb94ce78 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* factor qml_module out of qml_pluginOswald Buddenhagen2012-08-072-27/+32
| | | | | | | this makes it comfortable to create qml-only modules Change-Id: I17a5a3ee24210b93db05e50502c6ca91a4e7a9d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* use global imports install location as the "build" dir for qml plugin filesOswald Buddenhagen2012-08-071-2/+2
| | | | | | | | | when doing a non-prefix build (which is the only case where the code is executed), the build location is always the same anyway, so there is no use in complicating things. Change-Id: Id98755d818e05a11bed505abcb8b9d52a7d5b7c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* copy qml files to build dir only when doing a non-prefix buildOswald Buddenhagen2012-08-071-8/+10
| | | | | | | | non-installed -prefix builds can't do anything useful with qml plugin files anyway, so don't waste time on copying them. Change-Id: I23f4b8f67402a85d3c6e741a04f88567655c1655 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move IMPORT_VERSION fallback into the conditional of the consumerOswald Buddenhagen2012-08-071-1/+2
| | | | | Change-Id: I01336903aaaff8bca5407aa3c50d330e8fd7910a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move qmltypes "compiler" below TARGET manipulationOswald Buddenhagen2012-08-071-17/+17
| | | | | | | | load(resolve_target) must not be called before we have a final target name. Change-Id: Ia7418672b0c7b7fbd388a63819af9ea9a54c5241 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Rename msvc11 to msvc2012Andreas Holzammer2012-08-072-2/+2
| | | | | | | | | Microsoft has named their new Visual Studio again after the old naming schema. Change-Id: Ib1b971807fa89d90b10892a2d78570058e564f3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* add support for PKGCONFIG_PRIVATEOswald Buddenhagen2012-08-071-20/+28
| | | | | | | | | | | | this does the same as PKGCONFIG, only that the libraries end up in LIBS_PRIVATE, not LIBS, which means they don't end up in prl files. in the vast majority of cases, the user should use this new variable. Change-Id: Icb57a1166f1896f51284c64e4047cfc79410e73a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* add support for QT_PRIVATEOswald Buddenhagen2012-08-072-35/+43
| | | | | | | | | | | | | | | | this is handled the same way as the QT variable, only that the actual libraries end up in LIBS_PRIVATE, not LIBS, which means they don't end up in prl files. the handling of the two variables is entirely independent, including independent dependency resolution, so some libraries will typically end up twice on the linker command line. this is not a problem. Change-Id: I257ad0d414bf273c08a7bd6a874fe9ddb7356009 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* centralize+fix addition of copy_dir_files flagOswald Buddenhagen2012-08-0710-9/+12
| | | | | | | | this is in fact a shell-related flag, which determines how QMAKE_DIR_COPY is assumed to behave. Change-Id: If774f8a83b40c9ae7107c8e7ef7263af8a2e6c6e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* use QMAKE_LIBDIR for passing LSB library pathOswald Buddenhagen2012-08-041-1/+1
| | | | | | | -L in QMAKE_LFLAGS is just wrong Change-Id: I05eae0bb5e5e3dc8f8234616cb2ccdfba1d517fb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* s/QT_PRIVATE/QT_FOR_PRIVATE/Oswald Buddenhagen2012-08-041-5/+5
| | | | | | | | | | | QT_PRIVATE is meant to be for something different. only jsondb uses that so far. as it has little activity, i feel free to break it temporarily. Change-Id: Ifaa054af7234594ee534120c99506b76aebbf59f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce ability to selectively pass options to qdbusxml2cppOswald Buddenhagen2012-08-041-9/+31
| | | | | | | | | | | | DBUS_{INTERFACES,ADAPTORS} now also accepts "structures": DBUS_INTERFACES += foo foo.files = foo.xml bar.xml foo.header_flags = -i qfoobar.h foo.source_flags = .. Change-Id: I98d757c8d3a3c6f79cedca7b90b533289114c102 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* add ability to pass command line options to qdbusxml2cppOswald Buddenhagen2012-08-041-2/+5
| | | | | | | | QDBUSXML2CPP_{INTERFACES,ADAPTORS}_{HEADER,SOURCE}_FLAGS are now understood. Change-Id: I26492cec5ecb7ff4a6b83755ee8a0c17859b2a68 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* de-duplicate dbusadaptors.prf vs. dbusinterfaces.prfOswald Buddenhagen2012-08-043-81/+63
| | | | | | | | | | | it's two times the same code, once with "adaptor" (and an -a option) and once with "interface" (and a -p option). the de-duplicated code looks a bit nasty, as qmake cannot deal with braces on the LHS yet. Change-Id: I199a07947661ab9abe7a736b56c437f3f6dc4fa4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Add a .prf file for SIMD qmake variables.Michael Goddard2012-08-011-0/+273
| | | | | | | | | | | | So you can get AVX/NEON etc source compiled by assigning to the corresponding variable (e.g. AVX_SOURCES). This was previously used in just the gui module, but other external modules might like it too. Change-Id: I51aa64760c469c7dc4c71e6f089c2ddef4f509c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix host vs. makefile directory separator messOswald Buddenhagen2012-07-287-10/+10
| | | | | | | | | | | | | | | | | the system path separator and shell are bound to the host system (system() will use cmd even on mingw with sh.exe in path). the makefiles otoh may depend on what the qmakespec defines. consequently, add $$system_path() and $$system_quote() (for use with system() & $$system()). $$native_path() is renamed to $$shell_path() and should be used with $$shell_quote() to produce command lines in makefiles. $$QMAKE_DIR_SEP needs to be applied to Option::dir_sep right after parsing the spec, so it is available to $$shell_{path,quote}(). Change-Id: If3db4849e7f96068cf03a32348a24f3a72d6292c Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix debug and release build for Windows CEAndreas Holzammer2012-07-252-2/+2
| | | | | Change-Id: Idc3faa2c65f3e87aadf75c0c79f1581a24aff8ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix syntax error in static plugin assembly codeOswald Buddenhagen2012-07-251-1/+1
| | | | | | Change-Id: Ib7662c5529432663df06eea509dc3479cea01050 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix syntax error in breakpad supportOswald Buddenhagen2012-07-251-1/+1
| | | | | | Change-Id: I7964615814377ae4fd9c7da897978100c9294835 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't make the CMake file generation dependent on DESTDIR.Stephen Kelly2012-07-251-1/+1
| | | | | | | | | It is expected to be well defined for the CMake files to be generated correctly, but if that stops being the case, it should fail loudly. All of the generated CMake packages are CI tested. Change-Id: I67c7fa6ef1fe0a019c40936cb12db282669e9ee8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Quote the SONAME properly.Stephen Kelly2012-07-231-1/+1
| | | | | | | | It does not make a big difference, but it is what was intended initially. Change-Id: Idd7e06c857533030b000726ff87b48bb2619df06 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Create CMake files conditionally on the internal_module CONFIG option.Stephen Kelly2012-07-231-1/+1
| | | | | | | | | This includes a revert of 195df6e8e0ffb2636cfe395f560eb73c05a54b61 so that the solution scales better to other Qt modules, and other logic related to 'internal' modules. Change-Id: Ie4c1f10d20953aeb15438273081a810ab8bc9ec9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Check if we are creating a static library before a framework.Stephen Kelly2012-07-201-7/+7
| | | | | | | | | | Even if we are building frameworks, we still build some static libraries (eg QtUiTools). Static libraries are never in frameworks so we need to ensure that we don't generate a path to a framework in the CMake config file in that case. Change-Id: I533e30874a653695cb0e262617e71bbd3d4c954b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* TYPO: Fix typo in warning messageMontel Laurent2012-07-201-1/+1
| | | | | Change-Id: I322f97257210f123695e386670a9a4eea2ccfe0e Reviewed-by: David Faure <faure@kde.org>
* Add another directory to the private INCLUDE_DIRS list.Stephen Kelly2012-07-191-2/+8
| | | | | | | | | | It should be possible to include both: * <QtGui/private/qfoo.h> * <private/qfoo.h> Change-Id: I83ed5bba633b4a6b9bd38e315c987d78beecfb1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* put the include/ of all modules into qtbase when doing non-prefix buildOswald Buddenhagen2012-07-183-3/+12
| | | | | | | | | all other build artifacts go into qtbase's build directory anyway. this asymmetry was confusing and causes cmake users some grief. Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove support for forwarding module pri creation via syncqtOswald Buddenhagen2012-07-162-23/+11
| | | | | | | | | now that all modules have migrated, this dead code can be removed. Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Create imported targets if the library files existStephen Kelly2012-07-162-0/+27
| | | | | | | | | | | | | | | | | | Handle the cases where the user does ./configure -debug make make install make release make release_install Thereby making the installed configuration different to the 'configured' configuration. Change-Id: Ib351d8a84c4333ebcbd305d68a37c16f86869559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix the use of if() inside of macro().Stephen Kelly2012-07-161-1/+1
| | | | | | | | | if() seems to behave differently with macro parameters compared to variables set with set(). Change-Id: Ieb9544b8c3187579fd4cfe25e2c2afa3f349eba6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* make QMAKE_RESOLVED_TARGET use normalized path separatorsOswald Buddenhagen2012-07-162-2/+1
| | | | | Change-Id: I23433a67364a9d09fa239b2c7f2cae495d3cc6df Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make use of new functionsOswald Buddenhagen2012-07-165-18/+9
| | | | | | | makes for cleaner code Change-Id: I1a86bc4cac3778a1df37aa3307e5a8edac246961 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* automatically fix separators in QMAKE_{DIST,}CLEANOswald Buddenhagen2012-07-162-2/+2
| | | | | | | it's a tad insane to expect the user to do that Change-Id: I75c68f2a28656c9ba2e3fabcc79718b899b29ce7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* [QNX] Force UNIX-style separators on Windows hostsRafael Roquetto2012-07-131-0/+5
| | | | | | | | | The QNX toolchain, even on Windows, uses UNIX-style directory separators ('/'). Change-Id: I78575c9856b1700438c05ec0da81149688d85522 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* fix splitting of $PATH when looking for sh.exeOswald Buddenhagen2012-07-121-1/+2
| | | | | | Change-Id: I1ec0a48879d6ba7c0e2e7fdc0939980d0f817a68 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 00:03:33 +0000