summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* wrap ALL_DEPS somewhat sanelyOswald Buddenhagen2014-10-011-1/+1
| | | | | | | | otherwise we'll produce lines with tens of thousands columns when dealing with QMAKE_BUNDLE_DATA. Change-Id: Ia2a70f25e4ee1d3fe976027a7c46d234809a3f70 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* fix Info.plist location in framework bundlesOswald Buddenhagen2014-10-011-2/+7
| | | | | | | | | | | | | According to Apple's documentation [1], framework bundles don't have a 'Contents' folder. Instead, each version folder gets a 'Resources' folder which contains the Info.plist file, and which is also symlinked at the top-level framework folder. [1]: https://developer.apple.com/library/mac/documentation/macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32895 Change-Id: I5e55cc097b179012add0ceb7c567dace8e282895 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* don't try to create nested top-level bundle dir symlinksOswald Buddenhagen2014-10-011-2/+6
| | | | | | | | | the target path may have multiple components, e.g. Headers/private. obviously, only the first component must be linked in such cases. Task-number: QTBUG-32895 Change-Id: If632b3b72c170a9fde36e62c165e06ded53deda3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* de-duplicate top-level bundle symlink creationOswald Buddenhagen2014-10-011-7/+12
| | | | | | | | multiple QMAKE_BUNDLE_DATA entries can install into the same directory, but it obviously makes no sense to symlink that repeatedly. Change-Id: If65f7acdf4e158e33511917a027a380e642e2f28 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* redo bundle file dependency trackingOswald Buddenhagen2014-10-012-43/+16
| | | | | | | | | instead of duplicating the plist/icon/bundled_files logic just to obtain the dependencies, create them as a side effect of the actual target creation. Change-Id: I6a0fe26c82c490b1040a7a06d5d0e7a4567ae1af Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* fix omission of QMAKE_PKGINFO from sliced bundlesOswald Buddenhagen2014-10-011-0/+1
| | | | | Change-Id: Iff2c6686eae47e09fa6d046c60523aaf79aadfd5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add CFBundleVersion to the Info.plist files.Morten Johan Sørvig2014-10-011-2/+7
| | | | | | | | | | | | | Add @FULL_VERSION@ -> Qt version substitution to unixmake2. This makes the Qt-generated Info.plist files compliant with the bundle signing/validation process. Task-number: QTBUG-32896 Change-Id: I1818f028c2f740d699629dd78cc0fe6ffaf94a1c Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Don't make Info.plist for debug framework bundlesGabriel de Dietrich2014-10-011-55/+57
| | | | | | | | | | | | | | | We do so by setting a 'no_plist' config property. Can be overridden with 'force_debug_plist'. The debug version of Info.plist would overwrite the release version, and it also happens to contain invalid data. In particular, CFBundleExecutable would contain the _debug suffixed libname, which it shouldn't. See the entry about CFBundleExecutable on https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Task-number: QTBUG-32894 Change-Id: Ideb018e4768a7c4e276e1b07d77937451f6db6a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* centralize bundle_dir calculationOswald Buddenhagen2014-10-011-4/+4
| | | | | Change-Id: I353fb4eafc014bccdec71af42f8625b33488ae0d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* nest bundle-related conditionals for clarityOswald Buddenhagen2014-10-011-19/+20
| | | | | Change-Id: I97f9d87cb5a114bf4764f13f0fd0d22e9b4da96f Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* make top-level symlinks in bundles point to Current, not the major versionOswald Buddenhagen2014-10-011-1/+2
| | | | | | | | | | | | Current already points to the major version, and the other symlinks are supposed to take advantage of that (so a hypothetical change of major versions requires just one symlink to be adjusted). https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32895 Change-Id: I3c3a38c72ba18de6e48b20f2662341672022a274 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* write 'all' target laterOswald Buddenhagen2014-10-011-13/+10
| | | | | | | this allows us to extend its dependencies, which we will make use of later. Change-Id: I8809bdffb435455338e88e97049b10beeab0468a Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* qmake: Document the "aux" template type.Christian Kandeler2014-07-251-0/+12
| | | | | | | | Better late than never. Change-Id: If3bbeb4dfe3a8d49ceb02d9c2d0f2eff71595105 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* pass a pointer instead of a reference to initFrom()Oswald Buddenhagen2014-06-203-12/+12
| | | | | | | | | | msvc thinks that it's impossible to create a null reference (because some language lawyer said so) and thus complains about our assert that checks the reference's validity. work around by not dereferencing the pointers we already have. Change-Id: Ife2288d4187860105de12fdebc0e671e0159ace3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Ensure that there is no duplication of the output directory in outputAndy Shaw2014-06-061-1/+3
| | | | | | | | | | | When a relative path was specified as the output then it would be in both Option::output_dir and Option::output. Therefore in that case Option::output should be just the filename as Option::output_dir has the correct path to output to. Task-number: QTBUG-39460 Change-Id: Idc988e6bad94f34b89660fb5e8d6fa3a39dc623b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* install pdb files also for static librariesOswald Buddenhagen2014-06-051-4/+1
| | | | | | | | | | the condition is now consistent with that of the target itself (which means that by setting target.CONFIG=no_dll one can actually suppress installing the target itself even if it's not a dll, but anyway). Task-number: QTBUG-39253 Change-Id: Id4684a550a33b463594ab537eaa9e1cbfb61e4ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove the need for the dot in OS X/iOS bundle prefixSamuel Gaist2014-05-281-2/+4
| | | | | | | | | | | | | | This patch removes the need for the user to put a dot at the end of the bundle prefix which makes it's use more consistent and intuitive. The prefix is based on what Xcode calls the "Company Identifier", basically "com.digia" plus the product name. Changing that to "com.digia.prefix-" and the product name to "Foo" results in a bundle identifier of "com.digia.prefix-.Foo" which is in line with Xcode. Change-Id: I9b62fc4dee1df51b523ce890a8896ea58ea2c62d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Add build support for Windows Phone 8.1Andrew Knight2014-05-225-21/+35
| | | | | | | | Tweak qmake, add mkspecs for emulator and device, adjust the manifest template for WP8.1, and add missing icons. Change-Id: I7a6405fa85297ae4cc8522015274e65fb7a315a6 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* xcode generator: don't modify or copy QMAKE_INFO_PLISTRichard Moe Gustavsen2014-05-212-8/+10
| | | | | | | | | | | | | | | | | | | | | If the project has a custom Info.plist assigned to QMAKE_INFO_PLIST, we should leave it as-is without scanning and replacing contents inside it. Since we always copy the file to the build folder at qmake time, any later attempts to modify the source file will not have any effect. A better solution is to just reference the custom plist directly from the Xcode, without modifying it. This change will also stop unixmake2 from assigning the default plist to QMAKE_INFO_PLIST, since we need to know in the xcode generator if the variable was set in the project or not. Task-number: QTBUG-38260 Change-Id: I3c488b2960170c544d94f9db89d3ca95ee290bdd Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* move qlocale_mac.mm to OBJECTIVE_SOURCESJoerg Bornemann2014-05-081-1/+2
| | | | | | | | | This fixes a warning when loading qmake.pro in Qt Creator on OS X. Change-Id: Iabd70f2b5b9615d0fb1563081f485e6a4c828823 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake: Use QDir::toNativeSeparators on paths printed as infoAlessandro Portale2014-05-081-3/+3
| | | | | Change-Id: I8c587164bcff742f7ac8ad3f3f28e0b16645cb2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Xcode generator: resolve QMAKE_BUNDLE_RESOURCES from project sourceRichard Moe Gustavsen2014-05-061-1/+1
| | | | | | | | | | | | | | A pro file that adds files to QMAKE_BUNDLE_DATA using relative paths will fail building if doing shadow builds. The reason is that we look for the files inside the build dir. This change will make sure we resolve files from the source dir when not using full paths. Task-number: QTBUG-37054 Change-Id: Ic1067861097b3b6a640ee862472d728d6188576a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-014-27/+61
|\ | | | | | | | | | | This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
| * Fix vcxproj generation on Windows PhoneAndrew Knight2014-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | f412f2b5 refactored the platform tool set retrieval, but made the call too early to choose the right tool set on Windows Phone. This fixes the call so that it does not depend on the WinPhone member variable, and also makes it forward-compatible with Windows Phone 8.1. Task-number: QTBUG-38516 Change-Id: Ide91563f5c7f909c4d1a258adc29af6c94595dc9 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Android: Add "unversioned_libname" configurationEskil Abrahamsen Blomfeldt2014-04-252-25/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Android, there's a limitation set on the names of the libraries you deploy that they must start with "lib" and end with ".so", so Android apps will link against and deploy with the unversioned libQt5FooBar.so libraries. When cross-compiling on Windows however, due to the lack of symbolic links, the only installed library used to be the main library target "libQt5FooBar.so.X.Y.Z" (for version X.Y.Z.) This has been worked around in packaging, but breaks building add-on modules on top of Qt, and is clearly wrong. This patch introduces a new "unversioned_libname" configuration in qmake which is currently only supported for the Unix makefile generator and only enabled for Android builds. When it is enabled, only the unversioned library "libQt5FooBar.so" will be created. Task-number: QTBUG-38347 Change-Id: Ia8897ca7a23a62e2a526d0e02854899b02eb19dc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * document new QTPLUGIN magicOswald Buddenhagen2014-04-251-0/+10
| | | | | | | | | | | | | | Change-Id: Ia12f55a3e6bd670cb95c21c8f896b0451dd63693 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | fix $$shell_path() for mingw+shOswald Buddenhagen2014-04-301-2/+10
| | | | | | | | | | | | | | | | the msys shell expects unix-like paths with drives converted from d:\ to /d/. Change-Id: I09e25ed2c868702e5d7d8b9cc8c04cc13410eeff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Windows Phone: add language control to the package manifestAndrew Knight2014-04-301-0/+7
| | | | | | | | | | | | | | | | | | | | This allows the developer to provide a list of languages to the manifest by listing them in WINRT_MANIFEST.languages. It also allows setting the default language with WINRT_MANIFEST.default_language. Task-number: QTBUG-38557 Change-Id: I5cb94c9f45146e3068d0833b9e669dc17dca14b2 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | remove pointless checks for "." and ".."Joerg Bornemann2014-04-291-6/+3
| | | | | | | | | | Change-Id: Id2b1353a73012461c594319f9d1341bccef85ecc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | make use of QDir::NoDotAndDotDotJoerg Bornemann2014-04-292-16/+12
| | | | | | | | | | Change-Id: Ib4bdc0d4051fed25dec7dc030658b4d0822a37bd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-231-1/+1
|\| | | | | | | Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567
| * don't make relative paths if we don't know the top-level build dirOswald Buddenhagen2014-04-161-1/+1
| | | | | | | | | | | | | | | | regression from qt4. Task-number: QTBUG-37113 Change-Id: I34813f03d8ec686e3ecb49f66629079489a3d83d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | fix default QMAKE_PKGCONFIG_LIBDIROswald Buddenhagen2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | it needs neither native separators, nor a trailing separator. the QMAKE_PKGCONFIG_INCDIR default was already ok. Change-Id: I1048b3870fd3ca09aa76b41aecda7d90402aa64a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | don't emit -L/-F/-I with system dirs to .pc filesOswald Buddenhagen2014-04-151-5/+11
|/ | | | | | Change-Id: Idecb6f8ba61872c23856a8c7e22305c01c67f0b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* in command line args, escape tabs as wellOswald Buddenhagen2014-04-072-2/+3
| | | | | | Task-number: QTBUG-27154 Change-Id: I4a204b2bf2231027db55a444f304190c3b30878c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* de-duplicate codeOswald Buddenhagen2014-04-041-3/+3
| | | | | Change-Id: Ic056acf739659215241c1cab6a462b1ab591dc78 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* purge vestiges of opengl es 1 supportOswald Buddenhagen2014-04-041-4/+3
| | | | | | | | amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Don't fileFixify PRECOMPILED_HEADER twiceThiago Macieira2014-04-041-1/+1
| | | | | | | | | | fileFixify must not be called twice on the same file path, since it will convert an absolute path from the shadow build to an absolute path in the source dir. The first fileFixify occurs in MakefileGenerator::init, along with the fixifying of INCLUDEPATH. Change-Id: I607870573a80eaf834ea5f540bbe1451ec983114 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* vcxproj generator: append version suffix only to library targetsJoerg Bornemann2014-04-031-1/+3
| | | | | | Task-number: QTBUG-38066 Change-Id: I2f1635f2cb34acb388c380fc2fc3fbe4df04bb03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Windows XP target support for MSVC >= 2012Joerg Bornemann2014-04-031-2/+8
| | | | | | | | | | | | | | | | | | To enable windows xp support, we must do two things: 1. linker flag must be /SUBSYSTEM:CONSOLE,5.01 or /SUBSYSTEM:WINDOWS,5.01. For x64, the version is 5.02. 2. Do not use Windows Kit 8. Win SDK v7.1A is recommended. Prepend the right include paths and lib paths to INCLUDE and LIB before building. The Windows XP target support is enabled by passing "-target xp" to configure. Task-number: QTBUG-29939 Change-Id: I84c8439606cc2a9d27d64947702846faa4f1e4a2 Reviewed-by: Lucas Wang <wbsecg1@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move platform toolset retrieval to VcprojGeneratorJoerg Bornemann2014-04-035-26/+28
| | | | | | | | In a subsequent commit we will need access to more information of the project object. This is merely a refactoring. Change-Id: I40e501d037eb7d0295e1057e7b86e404e88e6ca3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add documentation for WINRT_MANIFESTMaurice Kalinowski2014-03-311-0/+112
| | | | | | | | Basically a copy of the inline documentation inside the prf file. Task-number: QTBUG-37788 Change-Id: Ie6df1597297223be778c748aad525f5521232cb7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* qmake: change a linker option in .pc file from -llibhoge to -lhogeTasuku Suzuki2014-03-261-1/+1
| | | | | Change-Id: Ib4d01bf190eec753f1b5e37e8e5871514e43ac71 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake: add replacement function getenvJoerg Bornemann2014-03-202-1/+18
| | | | | | | | | This is useful for querying environment variables which have parentheses in their name. Such jewels exist on Windows. The usual $$(VARNAME) syntax fails for those. Change-Id: I1d2766cabdc7f637caa9ae6408967685e02f5029 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make property name doc match realityOswald Buddenhagen2014-03-151-1/+1
| | | | | | | | it's QT_INSTALL_CONFIGURATION, not QT_INSTALL_SETTINGS. probably the most useless of all properties, but anyway. Change-Id: Ia1e739ab4ed59e2bcd3199914caed2b3db9070ee Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Windows: Support .pdb file names with spaces.Sérgio Martins2014-03-141-2/+3
| | | | | | | | Task-number: QTBUG-3314 Change-Id: I50a8739f134644e3561f1f7e2e04dac469da38b6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove definition QT_EDITIONKalle Viironen2014-03-131-4/+0
| | | | | | | | Remove definition QT_EDITION which was set in configure since it is not used anywhere anymore. Change-Id: I5c30ab47c6244fcb07707fd05e11decf2068f6d1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Honor the value of the PlatformToolset environment variable.Mat Sutcliffe2014-02-281-0/+10
| | | | | | | | | | | | | | | | The Windows SDK 7.1 command prompt sets this value to "WindowsSDK7.1" through its SetEnv.cmd batch script. The MSVC Express Editions do not include a 64bit compiler toolchain, but the Windows SDK does, so this change makes it easier to build qmake projects for x86_64 when using the Express Editions, by running qmake from the SDK command prompt. See also: http://msdn.microsoft.com/en-us/library/9yb4317s%28v=vs.100%29.aspx http://msdn.microsoft.com/en-us/library/ff660764%28v=vs.100%29.aspx Task-number: QTBUG-31185 Change-Id: I49d3e159ed67f64490a3d57c5471d540d76ae13f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix Windows RT build in amd64 host shellJoerg Bornemann2014-02-251-1/+5
| | | | | | | | | | When running a amd64 VS shell we must not call the x86_amd64 cross-compiler, because it won't be able to start. Instead we're calling the native amd64 compiler now. Change-Id: I6968cde3b24c1938b6e0d82f513e49724455f3cc Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Use QMAKE_TARGET_BUNDLE_PREFIX to build bundle identifierSamuel Gaist2014-02-191-1/+4
| | | | | | | | | | | | | Currently the bundle identifier is build using com.yourcompany + QMAKE_BUNDLE. This patch adds the handling of QMAKE_TARGET_BUNDLE_PREFIX to build the bundle prefix. Task-number: QTBUG-19006 Change-Id: I014279da6dbef393b0df36f6d4995e40ab105316 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 17:01:31 +0000