summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* remove definitions of QMAKE_{LIB,INC}DIR_QTOswald Buddenhagen2013-01-111-2/+0
| | | | | | | they are gone from all other specs Change-Id: I93f5800971733af9d9dbc66c7a900d1e2e967473 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix QMAKE_MAKE for qtCompileTest for cross building modulesMark Brand2013-01-071-5/+9
| | | | | | | | | | | | | Cross bulding on unix for mingw exploits the fact that makefiles generated for mingw work with plain make. There is no mingw32-make, so this is the only option. Arguably, plain make could also be used in an MSYS environment, perhaps detected by MINGW_IN_SHELL, but there might be good reasons I don't know about not to do this. Change-Id: I694c74046a307c2887af1c30cca36f95e242adc1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* add and use qtHaveModule() functionOswald Buddenhagen2012-12-212-1/+8
| | | | | | | | | | | this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix main() signature of headersclean stub fileKai Koehne2012-12-211-1/+1
| | | | | | | Fix MinGW build errors by using the standard main signature. Change-Id: I0ebe7307a825a7ec50e654f163fbf8fe7060a478 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge "Merge 'release' into stable" into refs/staging/stableOswald Buddenhagen2012-12-214-27/+5
|\
| * Merge 'release' into stableOswald Buddenhagen2012-12-194-27/+5
| |\ | | | | | | | | | Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
| | * stop defining QT.<module>.sourcesOswald Buddenhagen2012-12-142-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | it's the very antithesis of modularization to do it. Task-number: QTBUG-27722 Change-Id: I2540e1a70e67b55420246d0c209314c05c65a85f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Remove win32/thread.prf and thread_off.prfStephen Kelly2012-12-142-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables these files refer to are not set anywhere anymore. The Unix thread.prf file is still needed, as it is still effective and is activated by qt.prf. Task-number: QTBUG-25106 Change-Id: Ia514192d28785205df3710d78ee597285d4136b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * add .rpath only for dynamic unix buildsOswald Buddenhagen2012-12-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | rpath is meaningless for static libraries. and windows has no concept of rpaths to start with. Change-Id: Ia02bbdfbf7112e7082175c3051c0839ac0900f57 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Generalize the check for gui in static plugin import generationMiikka Heikkinen2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the check for gui by checking for needs_qpa_plugin CONFIG value instead, which gui adds to MODULE_CONFIG. Task-number: QTBUG-28215 Change-Id: I5834a3f81e5c3868ee1a3fa405ebc6410db1f900 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Enable forcing generation of static plugin importsMiikka Heikkinen2012-12-201-44/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using some modules requires importing static plugins also for shared libraries (namely QtAxServer), so provided a way to force plugin imports even for non-applications using force_import_plugins MODULE_CONFIG value. This required moving the plugin handling after qtAddModules calls in qt.prf. Task-number: QTBUG-28215 Change-Id: Id6bb92ed7c078cc8c54538ddc9bb8e8ad316f277 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fix the computation of the location of mkspecs.Stephen Kelly2012-12-201-4/+4
|/ / | | | | | | | | | | | | | | | | The location of the mkspecs directory comes from the archdatadir, which distros will all set. Change-Id: I20dbdce76db13dbd37eec065009e215f98985907 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-173-3/+2
| | | | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Fix installation of plugin module .pris in static Qt buildsMiikka Heikkinen2012-12-171-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt static, plugins get module .pri file, but those files do not get installed in Windows. This is because both .pri generation and install target statements are scoped with !build_pass, which means Makefile.Debug and Makefile.Release do not get install_pritarget target. Fixed by doing only the .pri generation in !build_pass scope. Task-number: QTBUG-28606 Change-Id: If3f49b578af1d9171a8bce67793ecb3f902a6da8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | updating qeglfshooks_imx6.cpp to 12.09.01 (L3.0.35) opengl-driversThomas Senyk2012-12-141-2/+2
| | | | | | | | | | | | | | Change-Id: Id19c1e99ca5c6a28c61f67b76181ebf85fd20a37 Reviewed-by: Otavio Salvador <otavio@ossystems.com.br> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | add some docu about the project loading sequenceOswald Buddenhagen2012-12-136-0/+20
| | | | | | | | | | Change-Id: Icb6bb58247724aeb6b9433a8d032718f1ba4babe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | mark a bunch of features as internalOswald Buddenhagen2012-12-1220-0/+219
|/ | | | | Change-Id: I5ad28827ff317985414e859263af85ceec31207c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* test: Mark cmake tests as insignificant when -no-widgets is usedSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28540 Change-Id: Iaa238ce8fb857ec8856dd9d6f3adc49795db1de1 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Automatically import plugins in all applications with static QtMiikka Heikkinen2012-12-112-4/+9
| | | | | | | | | | | | | | Since all gui applications already need some QPA plugin added, we might as well add the default plugin and generate the code to import the plugins automatically. User can opt out from the automation by removing relevant items from CONFIG variable: link_qpa_plugin or import_plugins. Task-number: QTBUG-28131 Change-Id: Ic171c363464c099143374d3e39bcc28f6edf73d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove QT_DLL and QT_NODLL defines.Stephen Kelly2012-12-111-5/+0
| | | | | | | Task-number: QTBUG-28044 Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* install a sane top-level examples.pro fileOswald Buddenhagen2012-12-111-1/+1
| | | | | | | | | | generally, don't install anything from the top-level examples dirs automatically. the global README and the aggregator examples.pro are installed explicitly. Change-Id: I5f6b8760f37d917b800fa85979896a471778cac0 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* re-enable "check" targets for all projects, but with opt-out possibilityOswald Buddenhagen2012-12-112-2/+1
| | | | | | | | | | | the feature was backported to qt 4.8, and people apparently started to rely on it. it doesn't add too much overhead when not used, so enable it by default again. Change-Id: I15890027603ede733347f2c05b36ad1389c649cf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix static lib dep additionOswald Buddenhagen2012-12-111-5/+6
| | | | | | | | | | leave MODULE_LIBS unmodified - MODULE_LIBS_ADD takes the role of the filtered variable. Change-Id: I2a67078bbc453eccc08317a1ca8e3228cbc3a8f7 Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize headersclean testOswald Buddenhagen2012-12-112-0/+106
| | | | | | | | | so other modules can actually re-use the code without referencing qtbase sources. Change-Id: Id66f07b476e539273dd32455e7642a17d7e5d0ef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.priMiikka Heikkinen2012-12-101-0/+4
| | | | | | | | | | | | | | | Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable to specify the default QPA plugin. "CONFIG += qpa_default_plugin" statement in application .pro file will add the default QPA plugin into QTPLUGINS. "CONFIG += qpa_minimal_plugin" statement in application .pro file will add the minimal QPA plugin into QTPLUGINS. Task-number: QTBUG-28131 Change-Id: I12a241005f30b37467d783b50f0369b47e605e68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Pro-file level support for importing plugins for static Qt buildsMiikka Heikkinen2012-12-102-2/+27
| | | | | | | | | | | | | | | | | | | | Platform plugin is needed always when gui is linked to an application. This is tedious to do manually for static builds, so provide support for generating a source file that imports static plugins for application projects. "CONFIG += import_plugins" statement in application .pro file will generate required import statements for all plugins specified with QTPLUGIN variable. The plugin class names are found from plugin's module pri generated automatically when plugin is built, as long as the plugin specifies the PLUGIN_CLASS_NAME in the plugin .pro file before loading qt_plugin.prf. Task-number: QTBUG-28131 Change-Id: I19f8ea48a3c1e9b5c81f4399c4b5d439a6d4bea1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Only handle QTPLUGIN when linking against static QtMiikka Heikkinen2012-12-071-1/+2
| | | | | | | | | Usage of QTPLUGIN implies static Qt, so only handle it when that is true so user projects do not need to scope it if they support linking against both static and shared Qt. Change-Id: I011b4672bac122d7d64d8f2fc0e41ca7e5251dfc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix module pri file name for static pluginsMiikka Heikkinen2012-12-071-1/+1
| | | | | | | | | | Since QTPLUGIN variable values are used to locate both the plugin library and the module pri file, those must match. Therefore generate module pri file name using the TARGET of the plugin rather than the pro file name. Change-Id: I9ec6f2a087ba3b3cecf7034c8a28b31df155cd97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move cmake template files under features/data/Oswald Buddenhagen2012-12-073-2/+2
| | | | | | | | | there will be more template data, and it wouldn't be too nice to spread it all over mkspecs/. Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* simplify code by using new $$absolute_path() functionOswald Buddenhagen2012-12-072-8/+2
| | | | | | Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* finish the job of removing uic3 supportOswald Buddenhagen2012-12-071-25/+14
| | | | | | | | this should have been in 048b697c07. Change-Id: I8589453ef937db1a9a446b0e5d01bb830b0cf6b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove another dead assignmentOswald Buddenhagen2012-12-071-1/+0
| | | | | Change-Id: I79ffdba571b48def4494b018b2a2abdee8aab0a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Only generate -fPIE on unix.Stephen Kelly2012-12-071-1/+1
| | | | | | | | This follows the same logic used to set bsymbolic_functions. Change-Id: I9300eab8a1b6673c4409b5dd07b40123fdf00d69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Topologically sort $${MODULE}.depends when generating cmake files.Stephen Kelly2012-12-071-1/+1
| | | | | | | | | | | | The contents of this eventually go into a CMake target property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect sorted input. Usually the contents is generated by CMake itself, so generating content it expects is reasonable. This fixes the qtactiveqt cmake unit test with MingW on linux. Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* replace all modules' build dirs while installing .pc, .la & .prl filesOswald Buddenhagen2012-12-061-2/+6
| | | | | | | | | now we may get files with several mentions of the same lib/include dirs on the same line, but that's essentially a non-issue. Task-number: QTBUG-28336 Change-Id: I8204086420b82015f62090ae0a56908ce0cccee8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* export the Qt top-level include dir as pkg-config ${includedir}Oswald Buddenhagen2012-12-061-2/+2
| | | | | | | | this seems more generic, and allows for more substitutions inside the generated files. Change-Id: I7a2e37036f9f9f7dbf7f28f0976ef427dd28ee82 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* export only 'host_bins' to pkg-config, rather than a random selection of toolsOswald Buddenhagen2012-12-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | the "export location" of the linguist tools was just bogus, and lconvert was missing anyway. the two dbus tools and qdoc were missing, too. generally, it seems useless to report the paths of some random tools - instead, just report the install location of the host binaries and let users figure out the complete paths themselves - this should be ok, as we decided that distributors are not supposed to do tool renaming any more. for the binary path just use the final location, as the files won't be used before installation anyway. this allows us removing the scary generic prefix replace from the pc file installs. and as a side effect this also fixes debug_and_release builds of core and widgets by not loading various prf files prematurely and thereby messing up the dir replacement magic. Task-number: QTBUG-28286 Change-Id: I99de419301fc07fb923959db4bd5cab9072d1c31 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove unused assignmentOswald Buddenhagen2012-12-061-1/+0
| | | | | Change-Id: Id60af477b9608bd3dfd0659d9d3a6e202fbe7dc9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't make the doc installs depend on the regular buildOswald Buddenhagen2012-12-051-2/+2
| | | | | | | it's pretty pointless Change-Id: Icea0073683a2d949798147fba3fad5b3331b1125 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix doc target recursionsOswald Buddenhagen2012-12-052-32/+32
| | | | | | | | | | | | | | | | | in particular for the meta Makefiles of debug_and_release. the logic is as follows: - the meta targets ('html_docs' in prepare_docs mode, and 'docs' always) need to branch out asap, so they are implemented non-recursively in every makefile. - all other targets need to be fully recursive. the meta Makefile will recurse only into one of debug or release, depending on the configure option (it doesn't matter anyway). Change-Id: I4e3f714cdda9c3a1021743148b5ee73379e3484d Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make the addition of docs/-install targets unconditionalOswald Buddenhagen2012-12-051-4/+0
| | | | | | | | there is no reason why something should break out of the system. Change-Id: I081bffc0927b43ac4940d0200e32e1e60f6f2e97 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge branch 'master' into stableOswald Buddenhagen2012-12-036-20/+16
|\ | | | | | | Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
| * don't forget to export rpath_link{,_private} to the cacheOswald Buddenhagen2012-12-031-0/+1
| | | | | | | | | | | | Change-Id: I1d204696ed0e4ef5e45dc1716b3d6a8224b3169b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * remove support for hand-written module pri filesOswald Buddenhagen2012-12-031-10/+0
| | | | | | | | | | | | | | | | all modules have been migrated to auto-generation Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * don't auto-install example sources by default for all modulesOswald Buddenhagen2012-12-031-1/+0
| | | | | | | | | | | | | | | | | | turns out that some modules need a lot of work, so make it opt-in for the time being. Change-Id: I16365e3d96adab98a1bc748907dbd67488dfad5f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * auto-collect qml-related sourcesOswald Buddenhagen2012-12-031-0/+5
| | | | | | | | | | | | | | Change-Id: Ia5b56227c2c1f18254d35f6105ac3a146f085e3b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * factor out testcase_targets.prfOswald Buddenhagen2012-12-033-9/+10
| | | | | | | | | | | | | | | | | | instead of letting *every* qmake-based project have recursive check target, let interested projects "subscribe" to it by adding CONFIG+=testcase_targets in a central place (.qmake.conf, which Qt itself does via qt_build_config.prf). Change-Id: Ib13fdd2d3a1adee0c5ad02b6b176a664c583bf9d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | introduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)Oswald Buddenhagen2012-12-032-3/+5
| | | | | | | | | | | | | | | | | | complementary to QMAKE_RPATHDIR. this avoids that we need to sprinkle linux/gcc specific code all over the place. Task-number: QTBUG-27427 Change-Id: Iebafd1749d1a0d803704902473df8c743f074ddc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Stop using the name "Trolltech" in QSettingsSergio Ahumada2012-12-032-2/+2
|/ | | | | | | | | Also change Trolltech for QtProject in other places Task-number: QTBUG-23269 Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize doc target related codeOswald Buddenhagen2012-12-025-53/+48
| | | | | | | Change-Id: I710a7f2fc3422ec8ba5b8e90bfd92e7931092ad0 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 01:14:41 +0000