summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* remove pointless checking/fallback code for $$TARGETOswald Buddenhagen2012-07-122-2/+0
| | | | | | | | | qmake always sets that variable, so unless somebody pro-actively screws it up (which doesn't seem like being worth checking for), it will just work. Change-Id: I3c4ada47cbd34ac68695d8efbf09c605392616f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove support for syncqt-based config testsOswald Buddenhagen2012-07-121-3/+0
| | | | | | | now that all modules have migrated, dispose of the clutter. Change-Id: Ib8937c1452536f645b76c0097b927df1108afc1a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* don't unnecessarily normalize $$[QT_INSTALL_*] any moreOswald Buddenhagen2012-07-121-5/+5
| | | | | | | they are always normalized nowadays Change-Id: I2d6d00639a4838da1a4def93a3416b000b8cd589 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* make the prl lookup search in standard locationsOswald Buddenhagen2012-07-122-4/+5
| | | | | | | | | | | | qtAddModule() skips adding standard library paths to LIBS. however, as processPrlFiles() didn't know anything about that, it would not find the prl files of qt libraries in these paths. so centralize the definition of these default paths (we should actually ask the linker for them) and use it in both places. do the same for the include paths for symmetry. Change-Id: I7e3692dc2d1c2d0c97a9151d15887b1263de137a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix QT.<module>.*_VERSION referencesOswald Buddenhagen2012-07-111-1/+1
| | | | | Change-Id: I448de417d86f2500015b967581dbe7aab58e894a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* do not mess with VERSIONOswald Buddenhagen2012-07-111-2/+2
| | | | | | | | the import version is not supposed to determine the plugin version - it's only used by the qmltypes target. Change-Id: I0cb072cb0ee469bd96830262dbf4971a2bf3134f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* support building tools as application bundlesOswald Buddenhagen2012-07-111-2/+4
| | | | | | | qmlplugindump needs that Change-Id: I3b6b6689a32744262184fa781fda465460a87640 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* add feature file for centralized qml plugin project handlingOswald Buddenhagen2012-07-111-0/+67
| | | | | | | Change-Id: I7cdce31d7ac458656cf8e8490fd7f7e5c04ca106 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Set the IMPORTED_SONAME for imported targets.Stephen Kelly2012-07-112-0/+4
| | | | | | | | | On windows this doesn't need to be set. On Mac I'm not sure yet on the various configurations. Change-Id: I31f191711a2ae0a1bb7221ae6e1fef377d62f1dc Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix the name of _debug libraries on APPLE.Stephen Kelly2012-07-111-2/+2
| | | | | | Change-Id: Id3ae730c0ce0630f8ccc222fe09e5d3da23d124d Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* fix linking against installations in /usr/libOswald Buddenhagen2012-07-101-2/+2
| | | | | Change-Id: I17a6a2e058f039e525461d459477329fd7090417 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make sure that building tests implies building other partsOswald Buddenhagen2012-07-101-2/+9
| | | | | | | | some tests have runtime deps on the other parts Change-Id: Ieb2925e762e94b3c0b16884be0f59e10ce8e4878 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adding iMX6-device-filesThomas Senyk2012-07-103-0/+180
| | | | | Change-Id: Ifdfacf7201c9ee47783ae782d1f9042fe529a039 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* deal with %PATH% containing parenthesesOswald Buddenhagen2012-07-091-1/+2
| | | | | | | | we need to make cmd escape the expanded output, so it doesn't confuse its own command line parsing (which happens later!). Change-Id: I0c2c71d276c0aebe3c2163f7f08db8050a14d7ce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qt_parts.prf: fixed handling of demosRohan McGovern2012-07-061-2/+2
| | | | | | | | | Subdir for demos/demos.pro is 'demos', not 'examples'. Change-Id: Ic4d80501e5d910891b0436ecd9881b79a4a99090 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qt_parts.prf: fixed examples, tests, tools always disabledRohan McGovern2012-07-061-4/+4
| | | | | | | | | exists() resolves the path relative to qmake's current working directory, which is mkspecs/features. Explicitly refer to the full path. Change-Id: I04e9f377528bffc1ebeeed69c86d73b85a117423 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* centralize handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-051-0/+44
| | | | | | Change-Id: I33b8c3958a102d87461ad887fa5749bd9a6dc037 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* make non-bootstrapped non-installed prefix-built executables runnableOswald Buddenhagen2012-07-052-15/+93
| | | | | | | | | tools like idc and lrelease are outside qtbase/bin and depend on libraries which are not in any search path, so we need some way to let the modules announce the locations (qt_tool.prf) and use it (in qtPrepareTool()). Change-Id: I98d5109cbee5e745d86dde94e3dc791d42edc3ec Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* set DLLDESTDIR only for non-prefix buildsOswald Buddenhagen2012-07-051-1/+1
| | | | | | | a prefix build needs to be installed first anyway Change-Id: I798861fddad2be289e9e4f182d0373e389b57437 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* set DLLDESTDIR to the build dir, not the install dirOswald Buddenhagen2012-07-051-1/+1
| | | | | Change-Id: I0aa3b512e5d633c5628c4bb285f96a41cda858d9 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fix FRAMEWORK_INCLUDE for MacIikka Eklund2012-07-051-1/+1
| | | | | | | | | | | | On Mac the framework include paths were generated wrong. The $${MODULE_NAME} was missing. This patch fixes the framework include path generation. Change-Id: Ic0e8d69ac7ac63be755302dc822c28240c9bc3d2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Skip (re-)creation of cmake files during build passes.Stephen Kelly2012-07-041-1/+1
| | | | | Change-Id: I03973220c17c065bc6ea391300b677e27f48a46f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Uppercase the CONFIG for verbatim mode.Stephen Kelly2012-07-041-1/+1
| | | | | Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Set the language of a STATIC library.Stephen Kelly2012-07-041-0/+1
| | | | | | | | This is used as a hint for the linker. Change-Id: I869039c1ea50f1926809ead4064317628ebbb2e7 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Avoid load(testcase) for installing test helper appsRohan McGovern2012-07-041-26/+30
| | | | | | | | | | | | Make test projects declare TEST_HELPER_INSTALLS rather than calling a function exported by testcase.prf. load(testcase) may be unsafe, as testcase.prf should be processed after default_post.prf. Fixes silent disabling of various autotests. Change-Id: I56b35ffd653a637ad5ab18d64dd1a1edadfac59f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Use qmake dirname function correctly.Stephen Kelly2012-07-031-1/+1
| | | | | | | It takes a variable name apparently. Change-Id: I9e2e2a0f6f5c42ecf9d07e4ac45954f14676d559 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QNX: set QMAKE_CXXFLAGS_CXX11Marc Mutz2012-07-031-0/+1
| | | | | | | | | | | | | | | | | | Rationale: QCC is a wrapper around GCC, but it doesn't understand -std, so we need to pass it via -Wc. The underlying GCC is v4.4, which doesn't know -std=c++11 yet, only c++0x. We can't use -std=c++0x here, because the QNX headers depend on some GNU extensions (nanosleep() was one that I saw), so it has to be gnu++0x, ie. STD C++ + GNU extensions. Change-Id: Ia5caf68f558b1638224e4876f1bbec84a0a93f67 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* qmake: improve the .pc files generatorKonstantin Ritt2012-07-031-0/+5
| | | | | | | | Don't hardcode the "qt_config" EXTRA variable and use QMAKE_PKGCONFIG_VARIABLES instead. This allows qmake create the .pc files that are unrelated to Qt. Change-Id: Ic72005e8819a15f6c50f3aaf79424a247fba20af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Look for CMake config files in the same prefixes as mkspecs.Stephen Kelly2012-07-031-1/+5
| | | | | | | | | This will allow tests of modules outside of qtbase to find their CMake config files. Change-Id: I68036908d0fd2ec640530b57d0f572d211ef44f0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Simplify logic for paths to CMake modules in tests.Stephen Kelly2012-07-031-5/+1
| | | | | | | Use a command line argument instead of an environment variable. Change-Id: I518b21d1fb9567d182384885a308c76e108598d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* android: remove QT_NO_QWS_TRANSFORMED from mkspecsRobin Burchell2012-07-031-1/+1
| | | | | | | this does nothing anymore Change-Id: If8798335dea935d1df9f085a7b4e1658f426809b Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* android: fix stupid thinko where cflags were set before the common includeRobin Burchell2012-07-033-9/+6
| | | | | | | | | this meant that the common mkspec was unable to do 'sensible' things with the cflags (hence -Wno-psabi not being applied to C++ code), and probably explains a lot of other weird things. Change-Id: I77079027dc1b2691c53212893eb90c7b935d00a2 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove stale qws related mkspecsDonald Carr2012-06-3015-691/+0
| | | | | | | | Should be be reintroduced with intent if there is sufficient interest, outside of the QWS context. Change-Id: I598f47b5cf0c10dd66534294d0f27cf0b4e5069a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Migrate linux-clang mkspec out of unsupportedDonald Carr2012-06-302-6/+4
| | | | | | Change-Id: I84abc4c305c28e46dd514d3fb78d27c051dc6048 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge "Merge branch 'buildsystem' (second round)" into refs/staging/masterMark Brand2012-06-295-17/+75
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 17:11:54 +0000