- 10 Nov, 2014 - 1 commit
-
-
Morten Johan Sørvig authored
Refactor the current app CFBundleIdentifier support: handle frameworks as well. Add @BUNDLEIDENTIFIER@ placeholder to the OS X info.plist.lib templates. This means the Qt frameworks will now get a valid CFBundleIdentifier entry the same way as app bundles: by extracting the identifier prefix from Xcode settings and appending framework name. Task-number: QTBUG-32896 Change-Id: Ica8f28332a88e37a823c46fca7a2c373157af020 Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-
- 01 Oct, 2014 - 12 commits
-
-
Oswald Buddenhagen authored
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>
-
Oswald Buddenhagen authored
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>
-
Oswald Buddenhagen authored
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>
-
Oswald Buddenhagen authored
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>
-
Oswald Buddenhagen authored
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>
-
Oswald Buddenhagen authored
Change-Id: Iff2c6686eae47e09fa6d046c60523aaf79aadfd5 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Morten Johan Sørvig authored
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>
-
Gabriel de Dietrich authored
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>
-
Oswald Buddenhagen authored
Change-Id: I353fb4eafc014bccdec71af42f8625b33488ae0d Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
Change-Id: I97f9d87cb5a114bf4764f13f0fd0d22e9b4da96f Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
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>
-
Oswald Buddenhagen authored
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>
-
- 24 Sep, 2014 - 1 commit
-
-
Matti Paaso authored
- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by:
Iikka Eklund <iikka.eklund@digia.com>
-
- 08 Sep, 2014 - 1 commit
-
-
Adam Strzelecki authored
If defined, the value of this variable is prepended to the built shared library's SONAME identifier. For more information, see: qmake/doc/src/qmake-manual.qdoc#qmake-soname-prefix Task-number: QTBUG-31814 Change-Id: I4bceaf0c93162e4fad6bb424af1b82e74d38acdc Reviewed-by:
Jake Petroules <jake.petroules@petroules.com>
-
- 30 Jul, 2014 - 1 commit
-
-
Thiago Macieira authored
At the very least, include the files named in the sources, like HEADERS. It was quite surprising to send a tarball that included the .pro file and the .cpp sources, but none of the headers. On the other hand, the .qmake.cache file need need not be sent either, despite being include()d in qmake's processing. Change-Id: I8f48ca3e8040f954f321f4643b01c0f36aafe2d7 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 02 Jun, 2014 - 1 commit
-
-
J-P Nurmi authored
The original dist target no longer copies files around, but merely does the final packaging. It depends on a new recursive distdir target, which handles copying distfiles to the distdir. [ChangeLog][Tools][qmake] Added 'make dist' target for subdirs projects (unix only) Task-number: QTBUG-21910 Change-Id: Ib59139c3fe196caf832d8dcefab484ab91f1f5ce Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 28 May, 2014 - 1 commit
-
-
Samuel Gaist authored
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>
-
- 27 May, 2014 - 1 commit
-
-
J-P Nurmi authored
Eliminate duplicate code => collect the default variables to MakefileGenerator::writeDefaultVariables(). Task-number: QTBUG-21910 Change-Id: Ia03ce0240dd9a101ad9d35db636cd88f38a49320 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 20 May, 2014 - 1 commit
-
-
Richard Moe Gustavsen authored
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>
-
- 25 Apr, 2014 - 1 commit
-
-
Eskil Abrahamsen Blomfeldt authored
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>
-
- 19 Feb, 2014 - 1 commit
-
-
Samuel Gaist authored
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>
-
- 30 Jan, 2014 - 1 commit
-
-
Andrew Knight authored
This variable works like CLEAN_DEPS, but applies to the distclean target. Change-Id: Ia30e8932b9acd6529298728dd5d0e038b0208d66 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 22 Jan, 2014 - 1 commit
-
-
Morten Johan Sørvig authored
Change-Id: I34aa77fc51b1ae4d7941f01fcb20236250454d19 Reviewed-by:
Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-
- 20 Jan, 2014 - 2 commits
-
-
Thiago Macieira authored
Assume that C and C++ headers found in system paths will not change, so we don't need to tell Make about them, nor do we need to scan their contents either. The previous qmake behavior matched gcc's -M switch; it now matches the -MM switch: -M Instead of outputting the result of preprocessing, output a rule suitable for make describing the dependencies of the main source file. -MM Like -M but do not mention header files that are found in system header directories, nor header files that are included, directly or indirectly, from such a header. This goes hand-in-hand with our use of -isystem to pass system paths to the compiler. Change-Id: I3346b6da496fe6495ac89c5286d066b343116f0e Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
Thiago Macieira authored
This commit will make qmake use -isystem automatically for any compilers that declare support for it for any paths that are listed in QMAKE_DEFAULT_INCDIRS. Change-Id: I36fefc6d5bba61671f65669f0ea42704b3c3cf31 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 17 Jan, 2014 - 1 commit
-
-
J-P Nurmi authored
This is a preparation step for 'make dist' target for subdir projects. UnixMakefileGenerator needs these variables while extending writeSubTargets() and writeDefaultVariables() for 'make dist'. Partial cherry-pick of https://qt.gitorious.org/qt/jpnurmi-qt/commit/8c4ef19 Task-number: QTBUG-21910 Change-Id: I02a616a98448bc3041ef0f4fd034bfb4c2199e41 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 13 Jan, 2014 - 1 commit
-
-
Oswald Buddenhagen authored
the diff -w for this commit is empty. Started-by:
Thiago Macieira <thiago.macieira@intel.com> Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
- 23 Dec, 2013 - 1 commit
-
-
Thiago Macieira authored
Right now, the sublib targets, if any, show up between clean and distclean targets. That's silly. I doubt anyone is using sublib targets anyway, but... Change-Id: I2beffc69f68fa7626ff4aa4a7cc1169b2c6c69a7 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 19 Dec, 2013 - 1 commit
-
-
J-P Nurmi authored
Task-number: QTBUG-21910 Change-Id: I4cc3f75f5ee4672f89b0b965055a02ac24c16cc8 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 13 Dec, 2013 - 1 commit
-
-
Thiago Macieira authored
Change-Id: Ied8148be931992247e446719a0eaeec0dc868330 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 03 Dec, 2013 - 1 commit
-
-
Oswald Buddenhagen authored
that means further detaching the generation and installation of debug info from the thing calling itself A Debug Build. Task-number: QTBUG-32412 Change-Id: I4d79d1ae4806c8e4a2d6a7ccd030fb88385dd7d4 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 25 Nov, 2013 - 1 commit
-
-
Oswald Buddenhagen authored
Task-number: QTBUG-3883 Change-Id: I288d830d6f73c69401ba81a70f35ee511e31bed5 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 21 Nov, 2013 - 1 commit
-
-
Oswald Buddenhagen authored
Change-Id: I7dd4024fb6fceb47431b626b586a471b74789cdc Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 20 Nov, 2013 - 1 commit
-
-
Oswald Buddenhagen authored
Change-Id: I2ed418064d43ab8cdab87af48e03d983c023ccf5 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 01 Nov, 2013 - 1 commit
-
-
Richard Moe Gustavsen authored
Warn the user if QMAKE_INFO_PLIST is set, but file not found. An iOS application will not run or deploy without an Info.plist present, and the error message given by xcodebuild is not very informative. Change-Id: I54f0e06de320a43c9f3261fe88761c41e3ccd022 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-
- 27 Aug, 2013 - 1 commit
-
-
Oswald Buddenhagen authored
as a side effect, this fixes the generators that were more bitrotted (nmake and even more mingw). Task-number: QTBUG-30644 #close Change-Id: Iefa3f07125884412d091aa12b44935e5b1fb858a Reviewed-by:
Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 13 Aug, 2013 - 1 commit
-
-
Stephen Kelly authored
Set the SONAME to the library name without the major version number appended, as android does not have the versioned symlinks. Change-Id: I41c504869019a393a3f112b2f7fc81c7ad5afa1c Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
BogDan Vatra <bogdan@kde.org>
-
- 22 Jul, 2013 - 2 commits
-
-
Oswald Buddenhagen authored
... as that causes debug+release installs to overwrite each other's postprocessed files. introduces CONFIG+=sliced_bundle, which instructs qmake to create file-by-file install commands. we don't know whether people are not putting files outside qmake's knowledge into the bundle build dir, so this mode is not necessarily backwards-compatible, and thus off by default. Task-number: QTBUG-28336 Change-Id: I23e90985ccd3311f0237ed61aadca6d7ed8325b7 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
by convention, $target.framework/$target links to Versions/Current/$target, not Versions/$version/$target. Versions/Current already links to $version. so this adds one indirection, but is otherwise the same. Change-Id: If3d1a3713712f4221ec31883977e50bce6f91764 Reviewed-by:
Jake Petroules <jake.petroules@petroules.com> Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-