summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-121-0/+40
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-112-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * | | | | | | | | | | | replace generic <QtGui> header as wellLars Knoll2011-05-081-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | small script to fix Qt4 include headersLars Knoll2011-05-071-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script goes through all includes of the style of and changes them to <QtWidget/QAction> Simply run over your source code to get most compile errors due to classes that moved between different Qt libraries fixed.
* | | | | | | | | | | | | Fix missing/broken license headersJason McDonald2011-09-133-10/+122
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54f3ca5979b78f9eec8115cc580c32321859acf6 Reviewed-on: http://codereview.qt-project.org/4514 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | | | | | | Partially revert 25a0cf881e6ca6dc8bd969e7047c3967796fcd94Aaron McCarthy2011-09-071-5/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the regexs in qtmodule-tests were fixed in the same commit it is no longer necessary to explicitly add the include statement. Any existing content unrelated to config tests is preserved. Change-Id: I90bab6b838191f050204992aa45262212b937059 Reviewed-on: http://codereview.qt.nokia.com/4296 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | | | | | Fix inclusion of .qmake.cache for modules with config tests.Aaron McCarthy2011-09-011-3/+10
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt modules with config tests generate a module level .qmake.cache with the results of the config tests. The existance of this file prevents qmake from walking up the directory tree and finding the Qt global cache file. This results in the system build not working as expected. For example running 'make' in the module would only build the contents of src and skip tests and examples. Fixed by adding a include statement to the end of the config test generated .qmake.cache. Change-Id: I68a5f2a96f4ee02076b6457ae085f45d894cd4ed Reviewed-on: http://codereview.qt.nokia.com/3830 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | | | | | | | | | Add QtV8 library to QtBaseKent Hansen2011-08-291-2/+7
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Aaron's copy of V8 to src/3rdparty/v8 (as a git submodule), and builds it as a "normal" Qt library (without any dependencies on Qt itself). The library can be added to a project with QT += v8-private V8 API headers are available as private includes, e.g. #include <private/v8.h> The API is private because we're exposing a third-party API directly, and we don't want to (and cannot) make source or binary compatibility guarantees for it. Since we want the V8 public API headers to be private headers in Qt, syncqt and sync.profile were extended to understand a new configuration option, the @allmoduleheadersprivate array, that tells syncqt whether all the library headers should be treated as private even though they don't follow the _p.h Qt convention. The V8 project files, patches and autotests are copied from the QtDeclarative repository. The next step after this commit is to remove QtDeclarative's copy of V8 and link with QtV8 instead. Task-number: QTBUG-20963 Change-Id: Ib8820362cdbc8fa662a5e97db841656cf38d1b62 Reviewed-on: http://codereview.qt.nokia.com/3092 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | | | | | | Don't use the // operator, since some versions of Perl don't have it.Michael Goddard2011-08-261-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could use || but it's only used for an if test anyway. Change-Id: I97fe251ab4f27fb75981af12316aaf5da053d47a Reviewed-on: http://codereview.qt.nokia.com/3431 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | | Report an error when the version header can't be writtenLincoln Ramsay2011-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If sync.profile points to a location that does not exist in the %modules section, the version header cannot be written. Report the error clearly so this problem can be identified. Change-Id: Ib681087f46362487ffb621221d33cf9b7e54df2f Reviewed-on: http://codereview.qt.nokia.com/2761 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | | | | | | | Don't print the "Configuration tests:" header if there aren't any.Michael Goddard2011-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7f0022348aba90e240f5b68e838430ec4e43ae9 Reviewed-on: http://codereview.qt.nokia.com/2228 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | | Allow adding to @ignore_headers from sync.profileMarius Storm-Olsen2011-08-041-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to avoid syncing certain files in QtDeclarative on Windows. Change-Id: Ia9fc95262ac18bafc39efc038ea70a1b5d67cddd Reviewed-on: http://codereview.qt.nokia.com/2641 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | | | | Try to make sure the config test script is installed.Michael Goddard2011-07-261-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | | | | | | Tighten up the config test success checking.Michael Goddard2011-07-261-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try a lot harder to remove the old $TARGET output, since make clean isn't sufficient. Also fix a bug in program invocation that was hidden because of the stale files. Change-Id: I0a365409d81efb74c5836eaf9f129fd9b2cca77e Reviewed-on: http://codereview.qt.nokia.com/2052 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | Add rudimentary config.test support when configuring modules.Michael Goddard2011-07-222-0/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extra script is added (qtmodule-configtests) which is currently invoked from syncqt (with some derived parameters passed to it). The module can optionally have an entry in the module's sync.profile file in the form of a perl map of "test name" => parameters. Tests can print an advisory message if they fail (e.g. "Install this SDK/dev package"), or abort the syncqt process (e.g. mandatory prereq missing). Also, if the test has a "requires(foo)" line that results in it being skipped, this is also supported. Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6 Reviewed-on: http://codereview.qt.nokia.com/928 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | | | | Prefix each output line with the library being processedMarius Storm-Olsen2011-07-211-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it easier to track which library output is coming from, when building Qt with -j > 1. Change-Id: I9acda04e84014dc441e409a0b24b2f78762dcc1c Reviewed-on: http://codereview.qt.nokia.com/1765 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | | | Make syncqt output more compact by default, and add verbosity levelMarius Storm-Olsen2011-07-211-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, syncqt will now compress the console output of what it's doing. Increasing the verbosity level will make syncqt output the same as before Change-Id: I542072504f022f87997b4036eda5747a5da88839 Reviewed-on: http://codereview.qt.nokia.com/1764 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | | Close filehandle when doneMarius Storm-Olsen2011-07-211-0/+3
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a fixme, since the version headers are currently being created in the source directory. Change-Id: If6e9eeba854a1f35561b69518eb8739dc28a58be Reviewed-on: http://codereview.qt.nokia.com/1763 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | | Sort all readdirs, so the output is reliableMarius Storm-Olsen2011-07-201-3/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the content of the generated module master headers to be reliable, so rebuilding in the same environment doesn't produce different results. This minimizes the diff from package building systems. Change-Id: Ic914f56e13b11f313f01f6b8666c2d28aa50a985 Reviewed-on: http://codereview.qt.nokia.com/1900 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Implemented module-local caching of module profiles.axis2011-06-031-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use syncqt to generate .qmake.cache also for submodules, which contains the location of forwarding module profiles for that module. This enables us to build without having to put module profiles into mkspecs/modules until install time. Also added support for -developer-build to syncqt. What it does is to point build directories for binaries and libraries to a common location in QtBase. This is more convenient when doing development, since you don't need to set your path to every module's bin/ directory, but it cannot be used with release builds, since they need to build independently of QtBase, in their own directory. Change-Id: I959c62c11c644f2147a98da894a72452d9c44327 Task: QTBUG-19585 Task: QTBUG-19583 Reviewed-on: http://codereview.qt.nokia.com/232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | | Make sure that we error out if we cannot write forwarding profile.axis2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0b62532dd8a52cf6ab7a7c10c5ffbe3c9039ec1 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/229 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | | Fixed an argument parsing bug in syncqt.axis2011-06-021-6/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to move the detection up above the general -no-* match, otherwise it never hits. Change-Id: I04ab5a1ed2c4a01219e7b9e10948b3fc4989f4b8 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/228 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-246-104/+104
| |_|/ |/| | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-22/+22
|\ \ \ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Fix a bug in syncqt.
| * | | Fix a bug in syncqt.Liang Qi2011-05-111-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the generation of version header file before the sync of header files. Reviewed-by: TrustMe
* | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-0/+40
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Add QT_xxx_VERSION macros for each library in qtbase
| * | Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-101-0/+40
| |/ | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | Improve logic to find default certificates in createpackage scriptMiikka Heikkinen2011-05-101-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation assumed createpackage script was always run from under Qt source tree bin directory, which is not always the case as on some platforms the Qt tools can be found from under EPOCROOT. Fixed it so that if the default directory for default certificates can't be found in the expected location, createpackage will attempt to query qmake in the same directory as the createpackage script for the location of the Qt source tree (QT_INSTALL_PREFIX) and look for default certificates directory from under there. Task-number: QTBUG-18684 Reviewed-by: Janne Koskinen (cherry picked from commit 01477af79d8114b3f8993c3967892538a599dfa6)
* | Fixed detection of QtBase directory.axis2011-05-101-3/+3
|/ | | | | | | | The old check would fail for an installed copy of Qt. Instead, base the check on using QTDIR if it present, otherwise use the parent of the bin directory, and then check that "mkspecs" is present. Reviewed-by: Olivier Goffart
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+21
| | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
* Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-021-2/+6
|
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-271-0/+1
|
* Fixed syncqt generation of bin path.axis2011-04-271-1/+1
| | | | | | Now it points to QtBase's bin directory, in the case of developer builds. This makes it easier to develop modules together without having to install them first.
* Added QT.<module>.imports support to module profiles.axis2011-04-271-0/+1
|
* Load the sync.profile after setting the variables.Prasanth Ullattil2011-04-271-9/+10
|
* Temporarily pointing QT_MODULE_LIB_BASE to qtbase/libPrasanth Ullattil2011-04-271-1/+1
| | | | | This has to changed when we start to generate the module binaries in their respective lib/bin folders.
* Made sure syncqt gets called correctly even if it is not in the PATH.axis2011-04-271-2/+4
|
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-271-0/+1
| | | | | | | Since modules cannot rely on QtCore having a build directory, nor can they build the applications directly into $$[QT_INSTALL_BINS] each module needs their own bin/. Add this path to each module's pri file, so others can use their applications
* Made syncqt collapse redundant ".." sections in paths.axis2011-04-271-0/+2
|
* Fixed useless substitution in syncqt.axis2011-04-271-1/+0
| | | | | The substitution is not necessary and messes up the argument that is passed in.
* Add hardcoded qclass_lib_map.h based on 4.8Marius Storm-Olsen2011-04-271-1/+1
| | | | This is only until UIC/Designer handles this properly
* Add the source path to the modules .pri fileMarius Storm-Olsen2011-04-271-0/+1
|
* Add module specific pris, and make syncqt create fwd includesMarius Storm-Olsen2011-04-271-3/+56
| | | | | | | | | | | | | | | | | | | | | | | The module specific pris define the modules name version dependencies include paths lib paths additional CONFIGs and DEFINES They are located in the modules source directory, with fwd includes created in QtBase/mkspecs/modules build directory. The pris use QT_MODULE_INCLUDE_BASE QT_MODULE_LIB_BASE to specify the locations for includes and libs. These paths are normally based on QT_INSTALL_HEADERS QT_INSTALL_LIBS for installed modules, but overridden to the module's build directory by syncqt for the fwd included pris. The path of the pris must be specified in the sync.profile for syncqt to create the fwding pris in QtBase.
* Make syncqt use sync.profile files from each moduleMarius Storm-Olsen2011-04-271-79/+84
| | | | | The sync.profile replaces the hardcoded paths inside syncqt, and enables it to work for other modules than just qtbase.
* Expose private support for separate module in syncqt.Liang Qi2011-04-271-1/+4
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-16/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2713-0/+2728
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12