summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new license filesMatti Paaso2014-09-2459-1114/+642
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Xcode generator: always create 'Copy Bundle Resources' phaseRichard Moe Gustavsen2014-09-201-11/+11
| | | | | | | | | | | | | | | If creating an asset catalog from Xcode, Xcode will add it to the "Copy Bundle Reources" phase, if it exists. Since we don't always generate that phase, Xcode will silently fail with the result that the asset catalog will not take effect (no icon, launch images etc). This patch will ensure that we always create the phase (like native Xcode project does), which will fix the problem. Change-Id: Ief949d63543977f1021db992e0c41714d898e68b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* make it possible to suppress warnings of the vcxproj generatorJoerg Bornemann2014-09-173-2/+18
| | | | | | | | | | When the user adds a compiler option that qmake doesn't understand, a warning message is printed. One can suppress these warnings now by adding CONFIG+=suppress_vcproj_warnings to the project file. Task-number: QTBUG-37520 Change-Id: Ieb7ad2c900329e76636047dff85824ea0456f608 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* add missing DefaultLanguage property for WinRT projectsJoerg Bornemann2014-09-151-1/+2
| | | | | | | Task-number: QTBUG-37628 Change-Id: I7cce0641b8958fe1d97ace21cb5392e32a067649 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Doc: Fixed broken links introduced by "OS X" doc change.Jerome Pasion2014-09-111-22/+22
| | | | | | | | | | | | | -qtdoc repo uses "OS X" instead of "Mac OS X" and this caused broken links. -more comprehensive change still needs to be done but the new name is used in the page to maintain consistency. At least within the page or class. Change-Id: I8a5650046fc0413cbb18359b743ecd30fd62e417 Task-number: QTBUG-40759 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qmake: Add QMAKE_SONAME_PREFIX variableAdam Strzelecki2014-09-083-0/+52
| | | | | | | | | | | 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>
* qmake: Don't make rpaths starting with @ or $ absoluteAdam Strzelecki2014-08-091-4/+6
| | | | | | | | | | | Defaults qmake behavior is to make all project RPATHDIR paths absolute prior passing them to linker. We need to make an exception for paths starting with @ such as @executable_path (Apple platforms) or $ such as $ORIGIN (Linux). Task-number: QTBUG-31814 Change-Id: Ie9887c0046c5030c4128dda945b491a5d389ba34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix compilation after qstringlist.h stopped including qdatastream.hThiago Macieira2014-08-081-0/+1
| | | | | Change-Id: Ida09e794262dce78cd5169aac56b610fabc9082c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Xcode: Reference files by absolute path, and name them by basename onlyTor Arne Vestbø2014-07-312-24/+21
| | | | | | | | | | | | | | | Xcode uses project and group relative file paths, but to keep things simple for ourselves we use absolute paths everywhere. We now make an effort to actually make these paths absolute before telling Xcode they are. We also make the visual representation of the files inside Xcode be just the filename, not the full path, like Xcode itself does. This is among other things a prerequisite for Xcode to stop complaining about missing launch images for retina 4-inch screens. Change-Id: I5ff6bf07f61888e3c9fe2f64cbc2beb896b8442d Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-07-301-0/+12
|\
| * Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-0/+12
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/network/ssl/qsslsocket_openssl_symbols.cpp Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
| | * 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>
* | | Xcode: Don't show QMAKE_INTERNAL_INCLUDED_FILES from Qt (prf/pri)Tor Arne Vestbø2014-07-301-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We build "Supporting Files" out of QMAKE_INTERNAL_INCLUDED_FILES, which is really not supposed to be exposed to the user like that, but since the variable will hold user-included pri files eg., the Xcode generator piggy-backs on this variable to list the files. To make the project view in Xcode a bit cleaner we explicitly exclude any file living inside the Qt directory, meaning we won't show all the pri and prf files from Qt's mkspecs directory anymore. Change-Id: I828700aceac5fdf3ea2b27d9ba3885543c2ad137 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Doc: remove old FORMS3 snippetJoerg Bornemann2014-07-301-8/+1
| | | | | | | | | | | | | | | Change-Id: Ibb39c85facfbe8604e4b8a47525eb2c6babd2716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | remove FORMS3 support from VS project generatorJoerg Bornemann2014-07-301-4/+0
| | | | | | | | | | | | | | | Change-Id: I3b2ce386a66c9635e62d1a729c75284d223c3423 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | add priority sorting to $$resolve_depends()Oswald Buddenhagen2014-07-302-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | all else being equal, items with a higher numerical priority will appear first in the result. Change-Id: I4ee37ff404a53c4152a1e4fc2fc3c23ef525234d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | remove pointless 'group' parameterOswald Buddenhagen2014-07-301-4/+4
| | | | | | | | | | | | | | | | | | | | | the c'tor always determines the group itself anyway. Change-Id: Ia8f1e747aaefdab164beae34851aa99cec9b790a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Correct the list of files included in "make dist"Thiago Macieira2014-07-303-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | don't compile the xcode generator on WindowsJoerg Bornemann2014-07-292-1/+5
|/ / | | | | | | | | | | | | | | With MSVC it takes minutes to compile pbuilder_pbx.cpp. So let's remove this generator that's never used. Change-Id: I13038d551283d96dfb0baf0b8a8a68c6538193c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | get rid of pointless MSVC security warningsJoerg Bornemann2014-07-241-1/+1
| | | | | | | | | | Change-Id: I546a30bddec8e3c5c9a42745f8458573b6db1bdf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | remove qsystemlibrary.obj from clean targetJoerg Bornemann2014-07-241-1/+0
| | | | | | | | | | | | | | This file is already listed in QTOBJS. Change-Id: I5c77620dc5e441435bd31a87a08178e0c82e9c05 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | fix qmake warning about unknown /Zc:strictStrings optionJoerg Bornemann2014-07-241-0/+2
| | | | | | | | | | | | | | | | Make /Zc:strictStrings known to qmake's MSVC compiler option parser. Change-Id: I5a4494096fc1d67c96c6de52bb0f1e94eff46136 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | QSettings: use QStandardPaths to get XDG_CONFIG_HOME.David Faure2014-07-233-3/+3
| | | | | | | | | | | | | | | | | | This allows to use the "test mode" of QStandardPaths in unittests, to stay away from the user's real settings. Change-Id: I1cb1f63a4bff35dfe236924c4dcd7cf761ee50c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Xcode: Fix QMAKE_PRE_LINK dependency handlingTor Arne Vestbø2014-07-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | Depending on *.o in the Xcode output dir did not actually result in a proper dependency. In Xcode5 this didn't matter much, as the effect was that the build phase was run every time, but in Xcode6 the phase was skipped. We now depend on the object directory itself, which will get its modification time updated to match any rebuilt object files. Change-Id: I8fa6f06c9008c4ce8f7fde7706057ce101bb5727 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Doc: Removed "url" variable from qdocconf files.Jerome Pasion2014-07-041-1/+0
| | | | | | | | | | | | | | | | url is set in qtbase/doc/global which is inherited by the Qt 5 module qdocconf files. Change-Id: Ieffa174f598f4a3b8ce8be9bfae7ca9b6981f12b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-014-13/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/network/socket/qnativesocketengine_winrt.cpp src/plugins/platforms/android/androidjniaccessibility.cpp src/plugins/platforms/windows/qwindowswindow.cpp Manually adjusted: mkspecs/qnx-armle-v7-qcc/qplatformdefs.h to include 9ce697f2d54be6d94381c72af28dda79cbc027d4 Thanks goes to Sergio for the qnx mkspecs adjustments. Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
| * 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>
* | winrt: Remove WP8.0 references from package manifest featureAndrew Knight2014-06-251-24/+10
| | | | | | | | | | | | | | Also, harmonize the qmake documentation. Change-Id: I8722370f86982e33ccf97f631ae257c4c46cade2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-056-27/+40
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
| * 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>
* | qmake: generate make dist target for subdir projectsJ-P Nurmi2014-06-023-29/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix QMAKE_EXTRA_COMPILERS' depend_command being ignoredGiuseppe D'Angelo2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | A typo caused qmake to stop output dependency information added by the depend_command clause. Task-number: QTBUG-13334 Change-Id: I00fabc87438ce94e80341e6f88aa2e0eaab57e19 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | qmake: share the default variablesJ-P Nurmi2014-05-273-28/+23
| | | | | | | | | | | | | | | | | | 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>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-05-222-8/+10
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-222-8/+10
| |\| | | | | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| | * 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>
* | | Xcode: Make QMAKE_BUNDLE_DATA always copy files relative to root of bundleTor Arne Vestbø2014-05-221-41/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of sometimes ending up inside Content/Resources. The two build phases PBXCopyFilesBuildPhase and PBXResourcesBuildPhase have different semantics of where to place the files. For the former we use the root of the bundle as the destination, and this is how QMAKE_BUNDLE_DATA is documented and used, as well as how unixmake2.cpp implements it. The latter on the other hand, always ends up in the resources subdirectory on OSX. Task-number: QTBUG-35318 Change-Id: I45bbd0dfe7ea78ae330ecb0c91efa74e1c76c9eb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | Xcode: Make sure we add a PBXBuildFile entry for ICONTor Arne Vestbø2014-05-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ICON qmake variable is implemented in the Xcode generator through the ProjectBuilderSources::files() function, where we append the icon to SOURCES (for some reason). This means we can't exclude non-object sources when writing out PBXBuildFile entries, as the icon file entry is referenced later on in the bundle resources phase. This is a partial revert of 66f6e5b162 which introduced the broken logic. Change-Id: I120d2325165a1eefd3961a9162e9e5eb3a576c36 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | De-inline QDebug destructorKai Koehne2014-05-222-1/+7
|/ / | | | | | | | | | | | | | | | | This injected quite some code on every use of qDebug and friends, while not giving any measurable performance benefits. Change-Id: I7b51f99130f18f1252da01e313f7b97c43a5480d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-131-1/+2
|\| | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85
| * 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>
* | remove unused macro definitionJoerg Bornemann2014-05-131-5/+0
| | | | | | | | | | Change-Id: Ic2451dd7ae352b9e515c52c20a43495066fb72c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-05-132-4/+4
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-132-4/+4
| |\| | | | | | | | | | | | | | | | | | | Manually changed enum to LibGL in src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
| | * 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>
* | | remove automagic command path fixing misfeatureJoerg Bornemann2014-05-121-52/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmake tried to extract the actual executable part of an extra compiler's commands and depend_command value and then "fix" it by replacing the directory separators in it with their local versions and calling QDir::cleanPath on it. This misfeature was implemented incompletely and led to unexpected results (see the numerous attempts to fix QTBUG-16372). The user is responsible for passing a correct command by calling the shell_quote or shell_escape functions if necessary. Change-Id: Ic4bfe9eeb697775cd99c865e7a9d335e63605dea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 10:54:44 +0000