summaryrefslogtreecommitdiffstats
path: root/src/modules
Commit message (Collapse)AuthorAgeFilesLines
* auto-generate module prisOswald Buddenhagen2012-06-1912-185/+0
| | | | | Change-Id: I654428771034221ccf424be34d5d9c7764daf3b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move moc, rcc and uic CONFIG additions to the respective qt modulesOswald Buddenhagen2012-06-192-0/+2
| | | | | | | they don't belong into the global scope Change-Id: I27a3de5f706392b3c4a84035521bc3b4e4055740 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Revert "List QtPrintSupport as a dependency of QtPlatformSupport."Lars Knoll2012-04-201-1/+1
| | | | | | | | | | | | This reverts commit 9c7cdce672df7da5c84b0ae6ca10ff09a670a315. platform support does not and should never depend on widgets or print support. Change-Id: I828d1dfc02e7993325cf653ed92100750761eaae Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* List QtPrintSupport as a dependency of QtPlatformSupport.Stephen Kelly2012-03-221-1/+1
| | | | | | | | | As it is a static library, it is also necessary to link to QtPrintSupport when using QtPlatformSupport. Change-Id: Id7ed458e5a7a0f6199d76b12f979faabb51d0f87 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move QtConcurrent into its own moduleLars Knoll2012-02-051-0/+15
| | | | | | | Task-number: QTBUG-20892 Change-Id: I614500aafb6428915509983608bbb0ade4e4f016 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove dependency of QtDBus onto QtXmlHarald Fernengel2012-01-221-1/+1
| | | | | | | | | Replace the QDom based code in qdbusxmlparser with code using QXmlStreamReader. Task-number: QTBUG-20856 Change-Id: I294e3ebd6faa813c20806be3ae225ac00befb622 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QtV8 library from QtBaseSimon Hausmann2012-01-091-16/+0
| | | | | | | | | | The QtV8 library is going to live in the qtjsbackend module. Change-Id: I72251316163829411dda998b9503ce6f75b3606a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* testlib: add QFINDTESTDATA macro for finding testdata filesRohan McGovern2011-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automated tests often need to load some data from external files. Currently, a wide variety of approaches for this have been used in Qt autotests, including: - embed the source directory into the test binary at compile time, and find the testdata relative to that; this fails when the source tree is no longer available (e.g. when the tests are deployed to a device). - use a path relative to the current working directory, and trust that the caller always sets the current working directory such that the testdata can be found; this fails when the caller uses a different working directory than expected. - use a path relative to QCoreApplication::applicationDirPath(); this fails when source tree != build tree (since testdata is not automatically copied into the build tree). - compile the files into the binary using the Qt resource system; this should work, but does not allow for testing of code which genuinely needs external files. It seems that there is not a simple method for determining the testdata path which can be reliably used in all circumstances, so various tests have reinvented the testdata location method in different ways. Therefore, this is a good candidate for an addition to the testlib API. The current implementation of QFINDTESTDATA is able to find testdata in all three of (build tree, install tree, source tree), in that order. Change-Id: Ib2fed860723ccf437240da3b00db22dfe1a6b56c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Install CMake config files from Qt.Stephen Kelly2011-11-291-0/+1
| | | | | | | | | This includes a BSD licenced file Qt5CoreMacros.cmake which is adapted from Qt4Macros.cmake in the CMake source tree. Change-Id: I54326b808795535490a0489659b351a8da72cdbb Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove network module from widgets dependencies.Stephen Kelly2011-11-281-1/+1
| | | | | | | | QtWidgets does not depend on QtNetwork. Change-Id: I50958033fd93a44be24c78fb5a20d7006b262b82 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Readded PrintSupport for WindowsOliver Wolff2011-10-251-2/+0
| | | | | | | | | | The prepared plugin architecture for printing support was used as much as possible but some functionality had to be done in src/printsupport. Change-Id: Ic8446cb8018a0970b4da97c1912ba6dc20d2a09f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mac: fix linking with Qt frameworks which don't exist at qmake timeRohan McGovern2011-09-171-0/+1
| | | | | | | | | | | | | | This restores the forced-vs-detection logic for Qt frameworks which was removed by commit ceed409b40fd5b8fe5c62ac33144e66f50b28ede. The problem of linking against Qt modules compiled as a static library is solved a different way: the module must explicitly state in the module .pri file that it is built as a static lib. Change-Id: Ie3d726f7b3933e5b5d27f15c6112ec1c7dee1ea2 Reviewed-on: http://codereview.qt-project.org/5034 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-132-30/+0
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-301-0/+16
|\ | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
| * Add QtV8 library to QtBaseKent Hansen2011-08-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Copy core GL functionality to QtGui with QGL -> QOpenGL naming.Samuel Rødal2011-08-291-0/+1
| | | | | | | | | | | | Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Temporarily disable printers on Windows, fix export.Friedemann Kleint2011-08-261-0/+2
| | | | | | | | | | | | | | Change-Id: I351692b53cf559cd3be64cec8907bd544ba41593 Reviewed-on: http://codereview.qt.nokia.com/3653 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* | Introduce new test macro for GUI applications.Friedemann Kleint2011-08-261-1/+1
| | | | | | | | | | | | | | | | | | Fixing linkage of the coreanimation examples on Windows. Change-Id: Ic34cab329577b2ba430ca8a510b356c424d574af Reviewed-on: http://codereview.qt.nokia.com/3605 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Move printing into it's own libraryLars Knoll2011-08-192-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Create a libQtPrintSupport library that contains our current printing infrastructure. Long term this will get replaced with a libQtPrint, as the current architecture is not really maintainable. Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2 Reviewed-on: http://codereview.qt.nokia.com/3209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Fix platformsupport as installable moduleJørgen Lind2011-08-111-0/+1
| | | | | | | | | | | | | | Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d Reviewed-on: http://codereview.qt.nokia.com/2868 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andy Nichols
* | QtPlatformSupport: A helper library for platform pluginsJørgen Lind2011-06-101-0/+14
| | | | | | | | | | | | | | | | QtPlatformSupport is a static library. Platform plugins are meant to link against this library to pull in dependencies such as fontengines and convenience functions for finding the right GL configs. The linker will only pull in the symbols used, so the size of the library doesn't really matter
* | Build from scratch, use correct version number in Widgets.Friedemann Kleint2011-05-241-3/+3
| | | | | | | | | | | | | | Order in src.pro needs to be correct since qtbase.pro forces ordered. Acked-by: Samuel Rødal <sroedal@trolltech.com>
* | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-1610-30/+30
|\| | | | | | | | | | | Conflicts: src/modules/qt_openvg.pri src/widgets/to_be_moved/qlinecontrol_p.h
| * Updated Qt and QtBase module version number to 5.0.0Eckhart Koppen2011-05-1311-33/+33
| | | | | | | | Updated version in qglobal.h as well as the module version itself
* | some build fixesLars Knoll2011-05-072-3/+3
| |
* | library splitLars Knoll2011-05-071-0/+14
| |
* | compile fixesLars Knoll2011-05-051-16/+0
|/
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-0211-57/+56
| | | | | | | 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.
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-2711-0/+12
|
* Added QT.<module>.imports support to module profiles.axis2011-04-2710-0/+10
|
* Move uitools from QtTools to QtBaseLiang Qi2011-04-272-0/+27
|
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-278-0/+8
| | | | | | | 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
* Extended module profiles.axis2011-04-279-0/+9
| | | | Each module now sets the QT_CONFIG variable itself.
* Move QtSvg into a separate repositoryLiang Qi2011-04-271-11/+0
|
* Add the private_includes path to the modules .pri fileLiang Qi2011-04-2710-0/+10
|
* Add the source path to the modules .pri fileMarius Storm-Olsen2011-04-2710-0/+10
|
* Remove the hardcode QT_CONFIG in those pri files.Liang Qi2011-04-2710-20/+0
|
* Add module specific pris, and make syncqt create fwd includesMarius Storm-Olsen2011-04-2710-0/+114
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 20:58:50 +0000