summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-204-36/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5
| * don't turn = into += in cumulative modeOswald Buddenhagen2014-01-151-25/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it leads to pathological cases where the number of loop iterations may go way beyond the reasonable. this means that users need to avoid using the = operator in alternative branches that lead to different sources/subdirectories being included into the project. this is a bit of a corner case anyway, as people usually add directly to SOURCES/SUBDIRS. Task-number: QTCREATORBUG-1595 Change-Id: I7783e318fbc2790f6a853ba4e3f4a12db881feb5 Reviewed-by: Daniel Teske <daniel.teske@digia.com> (cherry picked from qtcreator/30bd7fcce1aef974f6af9eaa6532aa1f2b6192d2) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * set QMAKE_INTERNAL_INCLUDED_FILES even without PROEVALUATOR_FULLOswald Buddenhagen2014-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | some qt prfs use this variable, so better set it it to avoid some noise. Change-Id: I606c88dd7664b1cd8b490d60badd5c6bf80fd1c9 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtcreator/e64cc71194cbe283dfe9bd2cd688f01fcdcadf34) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * qdocconf: Remove nonexistent dependencySze Howe Koh2014-01-151-1/+0
| | | | | | | | | | Change-Id: I9d2f36102691a2bd8ab0697d20f6eac59d59a84f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * fix memory leaks in MSVC generatorsJoerg Bornemann2014-01-102-6/+8
| | | | | | | | | | Change-Id: I11bfc8259ac4e175c9ecc37d64f1d2e5037f15aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Don't scan system includes for dependencies and don't list themThiago Macieira2014-01-202-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add support for using -isystem in qmakeThiago Macieira2014-01-205-2/+46
| | | | | | | | | | | | | | | | | | 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>
* | qmake: cleanup DISTFILESJ-P Nurmi2014-01-172-3/+6
| | | | | | | | | | | | | | | | | | Do not include the project file twice or other .pr? files outside the project tree. Task-number: QTBUG-21910 Change-Id: I62af842282ccdc5b9099d9227d5395ebe3f0698c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Replace win32-g++ with mingw scopeKai Koehne2014-01-171-1/+1
| | | | | | | | | | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | qmake: prepare TARGET/VERSION/DISTFILES for sub targetsJ-P Nurmi2014-01-172-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | expand tabs and related whitespace fixes in *.{cpp,h,qdoc}Oswald Buddenhagen2014-01-136-73/+73
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-102-23/+4
|\| | | | | | | Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e
| * fix detection for multiple VS installationsJoerg Bornemann2014-01-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | In the case of multiple VS installations, a static variable wasn't initialized. That led to wrong values in subsequent calls of the detection function. [ChangeLog][qtbase][qmake] fix detection for multiple VS installations Task-number: QTBUG-35530 Change-Id: I3fc23bc99679fff640f39578a7074d16fe923334 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * do not look for mkspecs/ directories in project treesOswald Buddenhagen2014-01-071-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | this pretty surprising behavior would interfere with building the examples from an installed qt tree with qmakes from other qt builds. .qmake.conf (and .qmake.cache) files provide a possibility to explicitly "anchor" project roots, so there is no point in having a second, even more magic way to do it. Task-number: QTBUG-35485 Change-Id: I8fd4fda67cabafdf55e7a98282dcdfaffb4a405e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Windows/Windows CE: Do not dynamically load shell32/coredll.Friedemann Kleint2014-01-071-1/+1
| | | | | | | | | | | | | | | | | | Those libraries are contained in QMAKE_LIBS_CORE and GetSpecialFolderPath() is present in all supported versions. Change-Id: Iae40714e0f234625b063aeb50e29fc79c4aaa6ea Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | qmake vcproj: Support setting the SDK versionAndrew Knight2014-01-073-11/+16
| | | | | | | | | | | | | | | | | | | | | | This adds the required members to allow setting the SDK version, and uses them when creating WinRT projects. Task-number: QTBUG-35328 Change-Id: I500ea77c41e27cbcc850462034c0eba8c5d1f124 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | qmake vcproj: Correct VCProject Version stringsAndrew Knight2014-01-071-2/+2
| | | | | | | | | | | | | | These strings are one version too large. Change-Id: If83649725ccf087075610255516ebf7a51338359 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | qmake vcproj generator: Add app manifest for WinRT projectsAndrew Knight2014-01-071-1/+39
| | | | | | | | | | | | | | | | | | | | | | When creating a MSVC project file for WinRT/WinPhone, the package manifest and all referenced icons should be automatically added as content items. Task-number: QTBUG-35328 Change-Id: Id7f34388c5ba6746392ddadbb795ef47bef34af6 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | qmake vcproj generator: Don't generate WinMD by default on WinRTAndrew Knight2014-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Visual Studio will default to generating metadata, even if it is not written to the vcproj. Since there is no metadata file, the build will fail. This change keeps a saner default for this option when generating WinRT project files. Task-number: QTBUG-35328 Change-Id: Ie693e270ef0b9d9677d53af0c60905f048235bc5 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | qmake vcproj generator: Honor the preferred MSVC version in the mkspecAndrew Knight2014-01-071-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Some cross-compiling mkspecs may require a different MSVC version than the one found in the path (or the default version). This change allows the preferred MSVC version to be selected from the mkspec's MSVC_VER variable when found. Task-number: QTBUG-35328 Change-Id: I19e03101e3921dfd5026421aef4630e11b9f131e Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-243-35/+29
|\| | | | | | | Change-Id: I2defae1904154283446b069d151c3ef57302ec7b
| * clean out some garbage in CONFIGOswald Buddenhagen2013-12-221-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | - thread was duplicated - x86 & ppc are obsolete and don't actually do anything - incremental was just plain nonsense (it does something entirely different, and it's better to hide this "feature" from public view) - resources is basically an implementation detail (it's on by default if qtcore is used) Change-Id: I9163af6e8db7988382ccf993d4be280f7faec1f2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * make qmake auto-rebuild after path reconfigurationOswald Buddenhagen2013-12-222-1/+3
| | | | | | | | | | | | | | | | | | while the dependencies in the manual projects are crappy anyway, it is still worth to cover the case of the user changing the install paths. Change-Id: I0a7ca5c8ba660c689d6d7af6b65d878390d6456f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix confusion surrounding debug, release & debug_and_releaseOswald Buddenhagen2013-12-221-25/+26
| | | | | | | | | | | | Done-with: Leena Miettinen <riitta-leena.miettinen@digia.com> Change-Id: I1e031402bc3d857cf29782957e5340e3c82f1ed2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2013-12-233-4/+20
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-163-4/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qplatformtheme.h tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-053-4/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
| | | * properly replace windows paths in installed meta filesOswald Buddenhagen2013-12-041-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's bogus in the first place that the meta files contain windows paths, but straightening that out is a prohibitive effort. so instead generate additional s/// commands which take care of these paths. fwiw, the generated s///i command is a gnu extension. but as we are doing this on windows only where we are using our built-in sed command anyway, this should be fine. Task-number: QTBUG-33794 Change-Id: I46fcc598db12816ee56b5371ab184f6277eb3a22 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | * support s///i option in built-in sedOswald Buddenhagen2013-12-041-2/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I7521699a9b833c8b1d640a843b82f213952bba5a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | * Add PBXCopyFilesBuildPhases to main target, not preprocessing stepTor Arne Vestbø2013-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the 'Wrapper' destination of the PBXCopyFilesBuildPhase will be empty, and the files end up outside of the application bundle. Task-number: QTBUG-34457 Change-Id: I799db28185a6c5d3d940602914fd8ba14c538bf2 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | | Move the SUBLIBS target from qmake away from between clean/distcleanThiago Macieira2013-12-231-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | qmake: do not include GENERATED_SOURCES to distJ-P Nurmi2013-12-201-2/+3
|/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-21910 Change-Id: I4cc3f75f5ee4672f89b0b965055a02ac24c16cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | PCH stands for "precompiled header", not "prefix"Thiago Macieira2013-12-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Ied8148be931992247e446719a0eaeec0dc868330 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Implement support for ref-qualified QString::toLatin1 & friendsThiago Macieira2013-12-133-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step in implementing an in-place conversion of QString to QByteArray. This requires ref-qualifiers in member functions so we know that we have an rvalue QString. Converting from UTF-16 to Latin1 always requires half the memory. For conversion from UTF-16 to UTF-8, the typical string will also need the same memory or less: characters from U+0000 to U+007F consume one fewer byte; characters from U+0080 to U+07FF and from U+10000 to U+1FFFFF occupy the same space in UTF-8 and UTF-16; it's only the ones from U+0800 to U+FFFF that consume more space in the UTF-8 string. For the locale's 8-bit codec, we can't be sure and the code (currently) needs to go through QTextCodec anyway. This requires a #define set before #include'ing "qstring.h". However, since qstring.h is included by the QtCore PCH, we need an extra qmake compiler without the PCH flags to compile this .cpp. After this change, the distribution of calls in QtCore, Network, Gui, and Widgets is as follows: const & && toUtf8 31 (74%) 11 (26%) toLatin1 79 (77%) 24 (23%) toLocal8Bit 26 (16%) 138 (84%) Change-Id: Idd96f9ddb51b989bc59f6da50054dd10c953dd4f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | qmake vcxproj: Provide saner defaults for certain WinRT optionsAndrew Knight2013-12-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default values for PCH, the -ZW switch, and CharacterSet aren't ideal for WinRT projects, so adjust these accordingly. Task-number: QTBUG-35328 Change-Id: I78021d0785fa84e15b1f17264daa599a9418f92e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | qmake: remove bogus commentJ-P Nurmi2013-12-101-2/+0
| | | | | | | | | | | | | | | | | | | | | the respective code was removed in 375edf7 Change-Id: Ie31ef4bc8970b5396f50f1c4963f378df816242a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | qmake: fix const correctnessJ-P Nurmi2013-12-104-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Partial cherry-pick of https://qt.gitorious.org/qt/jpnurmi-qt/commit/8c4ef19 Task-number: QTBUG-21910 Change-Id: Ieb833a977fc00d2637f8419278698c82b6086e2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-057-15/+24
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/sqlite/qsql_sqlite.cpp Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
| * | Doc: fixed invalid referenceNico Vertriest2013-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to "Getting started with qmake" was invalid Task-number: QTBUG-34749 Change-Id: I782dc99f5182f2fe7661377eb82f35ebb50a46cf Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | avoid vcX0.pdb files for qmakeOswald Buddenhagen2013-12-031-4/+2
| | | | | | | | | | | | | | | | | | | | | let the compiler use qmake.pdb, as the linker will. Change-Id: Ifafdfeff5a7d0ea91d796f76fbdc018c87cf8b78 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | make compiler use the project's pdb fileOswald Buddenhagen2013-12-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | this avoids the nasty and conflicting vcXX0.pdb files in the build dirs. VS will already do that. Change-Id: I7bddaecf3f478edc78cd6654b5a1038db4fe04ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | complete implementation of force_debug_infoOswald Buddenhagen2013-12-035-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | install pdb files also for executablesOswald Buddenhagen2013-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | the restriction to dlls is entirely unjustified. Change-Id: Ia518dd16189572dea9e8f4280c88801b1393694e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | make CONFIG+=no_dll affect pdb files as wellOswald Buddenhagen2013-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | this option suppresses the installation of target (leaving only dlltarget). however, it still installed target's pdb file. Change-Id: Ia686a647c101ca66e74944d23171e120fc74515a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-2622-172/+235
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-265-10/+24
| |\| | | | | | | | | | Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
| | * fix handling of \\ in replacement string in s/// cmd of built-in sedOswald Buddenhagen2013-11-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::replace() has no way of escaping capture group references, so simply disarm double backslashes. of course this is broken, but we'd need to reimplement it from scratch to fix it properly. "corner case" ... Change-Id: I357fbfd22c9c4a68809e5af6efad1de3a95706b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * fix handling of | in s/// commands of built-in sedOswald Buddenhagen2013-11-231-1/+1
| | | | | | | | | | | | | | | Change-Id: I139d007d68fb0aed4d9fbe57a14d1ede81ba40d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * adequately shell-escape generated sed commandsOswald Buddenhagen2013-11-232-1/+12
| | | | | | | | | | | | | | | Change-Id: I39c8c4ab3da69bd21beace56f5cf3070301ac015 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * install pdb files for dlltargetOswald Buddenhagen2013-11-211-2/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31129 Change-Id: I49ef3472d12b291999b4194b014b200df4b0f22d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>