summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge v5.1.0 releasebaserock/morphRichard Dale2013-07-0414-87/+193
|\
| * Add changes-5.1.0 filev5.1.0-rc2v5.1.0Sergio Ahumada2013-06-181-0/+48
| | | | | | | | | | | | Change-Id: I3ade90a360ccece54ac07b1c0c7f71d5bdffc3a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Find the cmake version template in the install location.Stephen Kelly2013-06-141-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-31153 Change-Id: Ibd90f9959306b34c2228e44d86cb03c97f47bb68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Assistant: Adding 'qtquickcontrolsstyles' to the list of qch loaded.v5.1.0-rc1Jerome Pasion2013-06-121-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-31692 Change-Id: Ie8e4befc75e0a2df9149c1bf028b88b2572e3148 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Doc: Rename Qt Designer license information pageTopi Reinio2013-05-301-3/+5
| | | | | | | | | | | | | | | | | | Rename the license information page to a more generic one, and list licenses for individual contributions under it. Task-number: QTBUG-28536 Change-Id: Ia88d99640ab23837f4db2a820fc95c9318d3b365 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * make error() abort the qmake run, not just the current fileOswald Buddenhagen2013-05-283-59/+86
| | | | | | | | | | | | | | | | | | | | | | | | sync up implementation with qmake. this doesn't actually have an effect on lupdate, as error() is disarmed in cumulative mode. Change-Id: I82fc55680f9ffb227e25acb39c797596225ba89e Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/0da7f097249f71726140a38647bb4824b09fad7b) Reviewed-by: hjk <hjk121@nokiamail.com>
| * add ProFileEvaluator::resolvedMkSpec()Daniel Teske2013-05-282-0/+7
| | | | | | | | | | | | | | | | | | | | | | sync up implementation with qtcreator. Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from qtcreator/867d655278398561c2bfe879e42062f93ae85453) (cherry picked from qtcreator/7d4e3b7b4c69c9bcc42aa278ce91f4188fc06534) Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * excerpt from "Qt4Project: Do a build_pass evaluation"Daniel Teske2013-05-284-12/+19
| | | | | | | | | | | | | | | | | | | | | | sync up the implementation with qtcreator Change-Id: I3673dd93b37b10102a0c1f1ce053e1aef8aaf53f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtcreator/95169eb8e39c6f43b7e74fbb18d4db19a38b0124) Reviewed-by: hjk <hjk121@nokiamail.com>
| * QMakeEvaluator: Set pro file as source for internal variablesOrgad Shaneh2013-05-281-4/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-7006 Change-Id: I3f599f92d03b6f9fdf65b12cf4090e28cc497fbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtcreator/6e3af2bf2e2833e0ecbc9b366af8e06abd7ecf96) Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * update size calculations for assignment statementsOswald Buddenhagen2013-05-282-4/+5
| | | | | | | | | | | | | | | | | | | | this was forgotten when the value lists were extended by a size hint. Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> (cherry picked from qtcreator/f24c9865306624c2fc150d4bd262a5c4d5a3689a) Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * add missing ifdeferyOswald Buddenhagen2013-05-281-0/+4
| | | | | | | | | | | | | | | | | | sync up implementation with qtcreator. Change-Id: I6a1578818512fa3b0773faf276a1d56881eb06d7 (cherry picked from qtcreator/0ad234b691aafedd5b78669780220334b951b045) Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix warningOrgad Shaneh2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Warnings came up using MinGW 4.4: * qmakebuiltins.cpp: 'QString windowsErrorCode()' defined but not used [...] Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/81f4ecdd7920ffcec4244bf70a0aedf4fbfb66e3, (cherry picked from qtcreator/0e13cf3faffc7463ae2bf535dfdb008202112cc4)) Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix Krazy warnings about includes/header guards in proparser.Friedemann Kleint2013-05-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie0067544492a207255a3ff3f43d95d2976c73c5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtcreator/80011dde399cfa43372dd23ff1b1f12afa4b7938) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * fix warning in ProStringList_joinJoerg Bornemann2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix C4267 MSVC warning. Make sepSize an int, because this function is never called with a size_t. Change-Id: I2b834fe7c1408e34d55d9f137231e2f5816f3f1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * Fix combobox not opening in treeview item delegate editorGabriel de Dietrich2013-05-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | This is the same fix as for QTBUG-30715, which leads me to think that we should spend some more time and re-think how QComboBox gets focus. See also qtbase 3b992f831. Task-number: QTBUG-31298 Change-Id: I4393af00c8896051e9ed8b5d8af510633106913c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Install .desktop files for the GUI appsRichard Dale2013-05-306-0/+278
| |
* | Unset the $TARGET environment variableRichard Dale2013-05-301-4/+4
| |
* | Add qttools.morph to build the chunkRichard Dale2013-05-301-0/+15
|/
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-6/+7
| | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I527d529456fba47fcb4e48c1129612d620878f0a Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Fix assistant and designer builds without printer.Janne Anttila2013-05-223-0/+6
| | | | | | | | | | | | | | The actual code using printer related classes is already wrapped with QT_NO_PRINTER macros, but the include statements were not. The reason why include statement probably were not wrapped with QT_NO_PRINTER is that in Qt4 all headers were synchronized to include directory. Now with Qt5 modularization headers for modules which are disabled are not anymore synchronized to include directory so they need to be wrapped with same ifdefs. Change-Id: I0efd1342cd18860b5fed63b248812e9dced8f2b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add missing documentation sets - still hardcoded :(kh12013-05-221-1/+9
| | | | | | | Task-number: QTBUG-31107 Change-Id: I517974a937baaa0371357bb7791d86b26f853049 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QtGradientEditor: Fix compiler warning about redefined macroKai Koehne2013-05-221-0/+2
| | | | | Change-Id: Ib946a2eb49bc7723dc44257581661a3b2b86956e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Designer: Remove unused typedefKai Koehne2013-05-221-1/+0
| | | | | Change-Id: Ibe91cb9573ec5ef9ca2cc0a7c36be33b0dec681f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix gcc warning about unused codeKai Koehne2013-05-221-0/+4
| | | | | Change-Id: I88bef60bb272319229a92481deec4ac9de9a0547 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Qt Designer: Fix help URL to point to qdesigner-manual.html.Friedemann Kleint2013-05-211-1/+1
| | | | | Change-Id: I59a14c7f2a2c770b4b67a2af5c4d5542519f0d63 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* create a .qmake.cache for the lupdate testsOswald Buddenhagen2013-05-212-0/+5
| | | | | | | | mac mkspecs are really noisy without it now, which makes the tests fail. Change-Id: I6b4900c51d0b8aedd9309482a30055e48c3b9f69 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* make stubs for dangerous/useless qmake functions in limited modeOswald Buddenhagen2013-05-212-16/+21
| | | | | | | | | | | | | | | | instead of having them "not implemented" (and consequently getting errors), just let requires(), system(), mkpath(), write_file(), touch() and cache() do nothing. this is likely to cause followup failures which are harder to detect, but the amount of scary noise we are producing now is not really acceptable. furthermore, in qtcreator these failures actually terminate the "precise" evaluation, which breaks Run Configurations. Task-number: QTBUG-28159 Task-number: QTCREATORBUG-8550 (in different repo) Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't send output of $$join() and $$sprintf() through split_value_list()Oswald Buddenhagen2013-05-211-3/+2
| | | | | | | | | | in the case of sprintf it's surprising, in the case of join it's anti-thetical. Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/ae94bf2b7a6373def9239ae5f54b143e1f6ffe09)
* clean paths of found files in prepareProject()Oswald Buddenhagen2013-05-211-3/+3
| | | | | | | | | any of the directories may be the root, which would lead to double slashes in the constructed filenames. Change-Id: I053e167a19b795b40e780fc29db356c7f24d286a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/97be79012cd39d1d0e7748d5c500d86c3becc258)
* make split_value_list() mostly saneOswald Buddenhagen2013-05-211-31/+38
| | | | | | | | | | | | | don't count parentheses, don't nest quotes, don't create empty elements. the backslash still escapes only quotes (and itself) - $$list() (one of the main users of this function) is commonly used with (windows) path lists, so letting it escape anything would make a royal mess. Change-Id: I29252fbe14fd6d28217450ec41cf8acfb2e30681 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/6c22b9b3e86d1617665f7b81b105c032f43c6d72) (cherry picked from qtbase/a5c2ab47867a558d6f8f62126fb8e4f2777cfe06)
* permit returning from filesOswald Buddenhagen2013-05-211-12/+17
| | | | | | | | | | this allows skipping an entire feature file if a condition is not fulfilled, without putting the whole body inside a conditional. Change-Id: I84fe9c94dda58c794fb52c3f163b40563b0db30a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/525eb337670f61078383c20ad9be274dcf2d0928)
* remove pointless initialization of qmakespecOswald Buddenhagen2013-05-211-1/+0
| | | | | | | | we have proper fallback paths further down the line. Change-Id: I3648cc985d21bbec4c2c24e179830db4467af210 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/0dedf8c3403923b963c51eb65d9cbe838d5ba0d4)
* Update feature paths on assignment to QMAKE_PLATFORMTor Arne Vestbø2013-05-212-1/+4
| | | | | | | | | | | | | Instead of after parsing the makespecs, were we assumed QMAKE_PLATFORM had been set by the makespec and did an explicit update. Allows loading platform specific features from within a makespec after updating QMAKE_PLATFORM. Change-Id: I0eb3b7fb88ce48b00a384850c5d87223c06234d7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/4dd29248cd43ff730f7432b51a443b72fad3523d) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove automatic splitting from $$() expansionsOswald Buddenhagen2013-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | $$(FOO) would automatically split the contents of the environment variable at whitespace (and interpret quoting inside it). the way to prevent the splitting (but not the quote interpretation) would be using "$$(FOO)". this behavior is entirely unexpected and thus an incredibly effective source of quoting problems - according to a grep over the whole qt sources, there isn't a single case where things were done right. in qt creator, well over half the cases are wrong. also, the "feature" seems entirely pointless: nobody uses spaces as separators in environment variables. consequently, simply remove it, even in a patch release. i'm postulating that nobody will complain. Change-Id: I9ed3df1b0d1ef602acd78ceb118611d294561da6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/566d28316dd73bfe4a8ea34839989ee9df7e3895)
* don't pretend that break()/next()/return() are functionsOswald Buddenhagen2013-05-216-37/+77
| | | | | | | | | | | | | | | | it's a pretty braindead thing to implement control flow statements as (built-in) functions. as a "side effect", this fixes return() value handling for lists. (cherry picked from qtcreator/f53ed6c4b3feca59a94d4f0de8b1a7411122e30e) (cherry picked from qtcreator/f529e22ec38fb9a656d74394e484d2453cf42c69) Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from qtbase/8400896cfe3fbef7666329a2920bd0dbdd5890af) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* improve parse error recovery pathsOswald Buddenhagen2013-05-211-4/+7
| | | | | | | | | | | | to reduce collateral damage from parse errors. (cherry picked from qtcreator/00c0d0d5e42d28e03c2846c17d3acbcd8420859d) Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from qtbase/ae3f95a951334dee001e37c305e4d7bf91c0d1b3) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Android: Fix for compilation error in clucene.v5.1.0-beta1Christian Strømme2013-05-072-1/+5
| | | | | | | | | Android only provide stubs for wcstoll(3) and wctomb(3), to solve this wcstoll(3) is replace by an internal equvialent, and wctomb(3) by wcrtomb(3). Change-Id: Ic30e5a809c2f6ab30b4e52883d3aae3ecc036194 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make use of qt_app.prfOswald Buddenhagen2013-05-0317-94/+32
| | | | | Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to new "configure -nomake tools" semanticsOswald Buddenhagen2013-05-036-1/+32
| | | | | Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless INCLUDEPATHsOswald Buddenhagen2013-05-031-3/+0
| | | | | Change-Id: I8e8bfd391ef8b243e288094f5a02544efe1b2f49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* parallelize SUBDIRSOswald Buddenhagen2013-05-035-5/+11
| | | | | | Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* remove pointless mac scopeOswald Buddenhagen2013-05-031-5/+0
| | | | | | | | | this subdir is only entered on mac. also, if this scope was actually skipped, the result would be rather unexpected ... Change-Id: Ie46b0bfcac081ff55b737c444d15ff6afaf1507b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pretenses of building kmap2qmapOswald Buddenhagen2013-05-031-2/+0
| | | | | | | | the 'embedded' scope (qws) is dead. Change-Id: I4942d90eac9583787610ed3217145240fa89693f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Improve warning message about code being auto-generatedAxel Waggershauser2013-04-222-1/+4
| | | | | Change-Id: I9b5460ed09ed458f86e4ea3001f73e482ef97765 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix trailing whitespace issue in ui4.cpp generating xslAxel Waggershauser2013-04-221-1/+1
| | | | | | | | Fix the line responsible for generating the trailing whitespace in the qtbase/src/tools/uic/ui4.cpp file. Change-Id: I446ce360c5064dc6a88b7b472790e9672cc6b30a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pretenses of building makeqpf automaticallyOswald Buddenhagen2013-04-221-3/+0
| | | | | | | | | | | the 'embedded' scope (qws) is dead. makeqpf is a graphical host tool to be used in the process of deploying embedded software. as the qt build system does not support such a configuration, the tool simply must be built manually. Change-Id: I6aeafb758e6e55ec228b535ef7354d4c78745e80 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Update README: it's not 2008 anymorePaul Olav Tvete2013-04-221-1/+2
| | | | | Change-Id: I4f4e1273216df9aadc9af789cdcda3127f0ccc3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make linguist's source viewer read all files as UTF-8.Mitch Curtis2013-04-171-1/+1
| | | | | | | | | | | | | | | It currently loads source files as latin1, which means unicode characters are not supported. 4944ea0586 removes -codecfortr and hence the ability to specify an encoding. lupdate will then treat all code as UTF-8, so this patch does that too. Task-number: QTBUG-27238 Change-Id: Iefed45de5b4925fee267834a5ed93457fc45b700 Reviewed-by: Debao Zhang <hello@debao.me> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: remove help output from the Qt Linguist ManualLeena Miettinen2013-04-162-97/+2
| | | | | | | | | This is difficult to maintain and users always get the up-to-date information by executing the help command. Change-Id: I13e9b7d7f89bb60d0b73cbbc721d6a8a05112a31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: describe translation sources in Developer topicLeena Miettinen2013-04-161-34/+74
| | | | | | | | Move information from the Release Manager topic and add information about QML sources in the Qt Linguist Manual. Change-Id: I0d2a2ea68a2e7e94895b41436d9f973d8c2cb2aa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
View Lorry Controller Status