summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* Make the examples test for QtDeclarative pass.Friedemann Kleint2012-10-312-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | - Fix check to indicate immediate errors, skip the loading state (using QTRY_VERIFY from shared/utils.h) and check for errors after loading again. - Exclude all broken examples. - Exclude shaders if import path is missing or OpenGL is not present. - Exclude Mac .app folders - Fix the DeclarativeViewer to check for the presence of the ImageMagick and ffmpeg executables only once, reducing test time. - Do not check for ImageMagick by running its command line tool 'convert' on Windows, since Windows has a tool of the same name that converts file systems (!). - Fix doc snippets to load correctly. Task-number: QTQAINFRA-428 Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
* Support other platform names on configure.exeRafael Roquetto2012-10-302-9/+68
| | | | | | | | | | | | | | | | | | | | | | | Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX, Blackberry, and Symbian*. Default platform name is "Windows". * Symbian is not present on the original Qt5 patch. Symbian is not supported on Qt5. cherry-picked from qt5 b87c5cff24229b1bcc77ac68699f2f03acabc9e7 Change-Id: I6a97e00d59cce36804c857aa57c5754a2f6277db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-142-0/+38
| | | | | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Original-patch-by: Greg Bentz (cherry picked from commit 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f) Change-Id: I5867fc03dde1ef6e2fbf3747bdb9aaf15518eb6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* More copyright changes to Digia Plc in translations and toolsjutaipal2012-10-1412-112/+112
| | | | | | | | Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-0810-30/+30
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed window raise issue when handling remote commandsTaito Silvola2012-10-041-1/+1
| | | | | | | | | | | Fixed remote command hanling in Qt Assistant. Now Qt Assistant tries to raise and activate main help window after processing the remote command. Task-number: QTBUG-25407 Change-Id: I6408b9795bdf21bb920830608ba23bfda7d41604 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> (cherry picked from qttools/883147fdaeeb2effbdb8a93a48f1ced49d56693e) Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-299-22/+11
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix gcc 4.6 warnings about assigned/unused variables in Qt Designer.Friedemann Kleint2012-09-2913-30/+2
| | | | | | Change-Id: Ic983e09769c812412defd6f84298770235c3ed48 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291244-28695/+28695
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* undo variable renaming in backportPeter Kümmel2012-09-171-1/+1
| | | | | | | | backport in commit fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 was incomplete and broke building of configure.exe Change-Id: I2c8b3b38beeca5629bec5bb2ca814242b12f0318 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add msvc2012 supportPeter Kümmel2012-09-174-3/+11
| | | | | | | | | | | The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS. It is a documented breaking change: http://msdn.microsoft.com/en-us/library/bb531344.aspx Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Never compile QPA with EGL support on WindowsNicolas Arnaud-Cormos2012-09-071-6/+10
| | | | | | | | It's a follow-up of d7168ae0ff930f19f206a1b56c03fc35b22bb948, which is doing exactly the same on linux. Change-Id: Id9eb996d2edf5867491fd420bdf743e0f799a778 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add cross_compile to qconfig.pri for global advertisingPeter Kümmel2012-09-071-1/+6
| | | | | | | | | | | .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make sure the parent widget still exists.Jarek Kobus2012-08-312-2/+4
| | | | | | | | | | | | It may happen that InPlaceWidgetHelper's destructor is called after parent widget destructor. Now inside InPlaceWidgetHelper's destructor we check if parent widget still exists. Task-number: QTCREATORBUG-7684 Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit aad795575646b37b5c531cb6314eaa049e90e076)
* Fix deleting of QTreeWidget items.Friedemann Kleint2012-08-201-0/+1
| | | | | | | | | | | | Breakage introduced by af617c319772a34115d0c4d802f25a807cb43065, which caused the autoconnections to no longer work. Task-number: QTBUG-26770 Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherry picked from commit c6616bcdc87b8665a2ea84b07dd04229f2ccbd7a)
* Disable 3DNOW on Blackberry/Win32Rafael Roquetto2012-08-171-0/+1
| | | | | | | | | | | 3DNow is being incorrectly auto-detected on Windows, causing it to be enabled by default when cross-compiling to Blackberry. In other words, the code line introduced by this patch should have already been there since the beginning, but it got lost somehow. So here it is. Change-Id: Iad0b90908602633e3046b54c1c60139c6483632d Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Prepare QtHelp library for modularized documentation.Pierre Rossi2012-08-1511-31/+65
| | | | | | | | | | | | | | - Support ".." in QCH documentation file paths. This essentially means that we stop using cleanPath, and where needed, prepend the virtual folder name, followed by "/..", in front of the original path. - Remove com.trolltech default DocPath since this was not used anymore. (Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939) Change-Id: I6508529de756bad979356c63bfcf6c55a609e827 Done-with: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* add configure options for debug/release OpenSSLPeter Kümmel2012-08-152-10/+33
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63 Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Changed qt version to 4.8.3jutaipal2012-08-0810-30/+30
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Properly handle include cyclesKevin Ottens2012-08-081-28/+75
| | | | | | | | | | | | | | | | | | | | | | | Currently lupdate is just issuing a warning when it detects an include cycle. Since it's not a full preprocessor, most of those warnings are false positives, but they need special handling, this patch provides that. Now every result is stored as part of a cycle (so in the general case a cycle of one file). When detecting a cycle, instead instead of issuing a warning, we record the presence of the newly detected cycle for later use and merge the other relevant cycles with it. When retrieving results now it's not for a single file anymore but for a complete cycle at once (which can turn out to be a cycle of one file). This is a backport of the commit done in qttools with revision 3b99677b3376924e347ec4aeb0c363438146bfde Task-number: QTBUG-6587 Change-Id: Idc79fbac4f69478ccff1464c1f4278d4afbf9d61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011194-2395/+2395
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add defaults for Blackberry platform on configureRafael Roquetto2012-07-301-0/+25
| | | | | | | Adds default values for Blackbery platform configuration on configure.exe. Change-Id: I11e4f7135d88fcc6133194d6a82863ae494c8c82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use improved QLibrary search heuristics for QMeegoRuntimeSean Harmer2012-07-271-1/+1
| | | | | Change-Id: Ibe649c6ca7f3dad96f1e624efdb2051eb724a6fb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-181-4/+9
| | | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124 Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* New command line switches for configure.exeRafael Roquetto2012-07-161-2/+184
| | | | | | | | | | | | | | | | | | | Adds support for the following command line switches to configure.exe tool: * -qpa * -nis (-no-nis) * -neon (-no-neon) * -largefile * -little-endian (-big-endian) * -fontconfig (-no-fontconfig) * -system-freetype * -gnu-iconv * -sun-iconv * -posix-ipc based on qt5/qtbase: 1838a6c2fb5e3b4368c871aa330d028b255b83af Change-Id: I4a5adf09e4c0e312372b96dceb87ff3310e26ba6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't change the current page of mainwindow containerJarek Kobus2012-07-061-1/+1
| | | | | | | Task-number: QTBUG-12097 Change-Id: I3d9fa918ac8ea9ee419a3384f0d9e33366315a6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update macdeployqt plugin deployment logic.Morten Johan Sorvig2012-07-051-0/+12
| | | | | | | | Handle qmltooling, graphics system and bearer plugins. Change-Id: I6f75dc600255013b88558d265a1b1ed25369f8e9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix Assistant crash when closing last tab.Markku Heikkila2012-06-252-0/+11
| | | | | | | | | | | | | | | | Disable 'Close Tab' action from 'File' menu for last tab to avoid crash. Context menu 'close' actions in "open pages" widget, are already disabled under same conditions. Manually cherry-picked from Qt5: Change I7f285f45: Fix Assistant crash when closing last tab Task-number: QTBUG-23986 Change-Id: I0176451c80f0d25e82c7cd4fb2076c23c9d50128 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* makeqpf: Fixing range in character-generationMartin Wodok2012-06-013-3/+3
| | | | | | | | | | | | | | | | | MakeQPF currently omits generating the last character in the selected ranges, e.g. ranges requested for conversion are 0..127 128..255 then only the characters 0..126 128..254 are generated in the QPF2 output file. This fixes it, so that character 255 (in this example) also gets created. This is according to the usage-specification! Change-Id: Id85215781c9a67a90ac05efbbf374240f25bbb3c Track-number: QTBUG-19561 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Support mkspecs in subdirs for xcompile under windowsAndreas Holzammer2012-05-251-3/+11
| | | | | | | | | | | | Support mkspecs in subdirectories for cross compilation under windows. Mkspecs in subdirectories are separated by slashes. backport from qt5 a3a1fea094434e29c362caba711c7d9883461792 Change-Id: Id3954cc38df2922b20156589335faad989ec0537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-309-3/+36
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qdoc: Disambiguate prev and next links in html sourceDaniel Molkentin2012-04-261-2/+2
| | | | | Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add icons for previous and next page.Daniel Molkentin2012-04-262-0/+4
| | | | | Change-Id: I3b16c70b4742a942ceec2035c46618ebc63b697f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* docs: fix conflicting resource file namesDaniel Molkentin2012-04-261-1/+1
| | | | | Change-Id: I10bd6abe214507f663cc7c6a0b3a6f3c69668360 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Remove the text around previous and next page links.Casper van Donderen2012-04-261-4/+4
| | | | | | | | | Previously we printed "[Previous: <link>] and [Next: <link>]. After this change we only print the <link>, which should include an icon. Change-Id: I7bf46623b3bce6b02067127338a1235861449e64 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix annotation processing for qtTypeNameMartin Gräßlin2012-04-221-1/+1
| | | | | | | | | An old annotation was incorrectly ignored and not recognized as the deprecated annotation causing the tool to exit instead of printing out a warning and returning the type name. Change-Id: I703933f1f75ca37e908b095a2bde803226fd01a7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update com.trolltech -> org.qtproject in the bootstrapped toolsThiago Macieira2012-04-201-13/+40
| | | | | | | | | | | | | | | | The tools will now generate the new org.qtproject annotations only, matching the XML generator in the library. They accept both types of annotations as input though -- and will generate a warning about the older one. This commit should be backported to Qt 4, so XML files can start to be ported. Task-number: QTBUG-23274 Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com> (cherry-picked from commit f18a6c5fb569ab93e86ca4b75301a7495ba17768)
* Bump Qt version to 4.8.2aksalova2012-04-1810-31/+31
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+10
| | | | | | | | | | Although the QtDesigner module isn't built by default on embedded platforms, it's sometimes needed, mainly for dynamic form loading. The library contains a couple of setCursor calls which should then be #ifdef'd, as it's often a disabled feature for embedded UIs. Change-Id: I92d91249905848e73ee933e6f057a30b9cacb03c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed build failure in tools/qml for HarmattanGareth Stockwell2012-04-051-11/+11
| | | | | Change-Id: I6fb26f2da3ff78dd20d06941ae1aedd059f116ff Reviewed-by: Martin Jones <martin.jones@nokia.com>
* compile without rttiOswald Buddenhagen2012-03-201-1/+1
| | | | | | | | no point in it Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit dc810b81a38a2a4d33f6909ff213809e1bf384ca)
* remove pointless include pathsOswald Buddenhagen2012-03-201-6/+0
| | | | | | | | we rely on a syncqt'd tree anyway Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 946501ab350f0c3dbaf163c03415f459efb8c6bd)
* properly enable stl via qmake instead of hacking compiler flagsOswald Buddenhagen2012-03-201-2/+1
| | | | | | Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)
* build with QT_NO_GEOM_VARIANTOswald Buddenhagen2012-03-201-5/+1
| | | | | | | | saves us some pointless code Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)
* add missing errno.h includeOswald Buddenhagen2012-03-201-0/+1
| | | | | | | | it was masked by the precompiled header Change-Id: I9ba7b0faa716cfa6844b9a9f81fa2a3aa67f5da4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2b969b89b95317f04bd562aee3528cab227e57b8)
* remove bizarre magic from precompiled headerOswald Buddenhagen2012-03-201-26/+1
| | | | | | | | it doesn't serve any puropse (any more?) and it breaks the mingw build. Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 0678a7db8e8eb6997b0acb106dd4347ef8c76fbe)
* Update the links in the titlebar of Online HTML template.Casper van Donderen2012-03-173-6/+6
| | | | | | | | The links were still pointing to old URLs, this change changes the links to point to qt-project.org Change-Id: Ie0b7b5aef693c54174e5400d6a16bdbfb540c763 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix compiling qvfb on Linux/X11Pasi Petäjäjärvi2012-03-151-2/+0
| | | | | | | | | | | | | Qvfb fails to compile on linux. Fixed by removing duplicate source and header file inclusion from qvfb.pro file when embedded flag is not set in CONFIG. Task-number: QTBUG-19804 Change-Id: I09278c8042204f913ca2c2bbdee4d4163fae213d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix generating the qdoc3 manual in 4.8Casper van Donderen2012-03-142-3/+4
| | | | | | | | There were some qdoc errors when generating the qdoc manual. This change fixes thoise qdoc errors. Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Update the footer for qdoc output for qt-project.Casper van Donderen2012-03-148-116/+114
| | | | | Change-Id: I6518c03715cd485330a6550bd62d385477a45c7a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
generated by cgit v0.12 at 2024-11-26 03:01:44 (GMT)