summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Include pixel size of font in exported HTML from QTextDocumentEskil Abrahamsen Blomfeldt2011-05-041-0/+8
| | | | | | | | | | | When you copy-pasted rich text in which the font size had been set using setPixelSize() the font size would be mysteriously forgotten. The pixel size property in QTextCharFormat was added ad hoc, and not integrated in the HTML exporter. Task-number: QT-4792 Reviewed-by: Gunnar (cherry picked from commit 5aa5c2e2935c1829cc6965198968699f17c24ec0)
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-0230-76/+87
| | | | | | | 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.
* Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-0210-5/+41
| | | | Output warning if not present
* QNetworkConfigurationManager: Fix network polling.Martin Petersson2011-05-022-2/+14
| | | | | | | | | | | | startPolling() is called by each engine, so before it would start multiple singleshot timers. So I moved the timer to the class and check if it has already been started before it is activated again. So that we just use one timer. Task-number: QTBUG-17219 Reviewed-by: Iiro Kause Reviewed-by: Kranthi Kuntala (cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
* QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2011-05-021-2/+2
| | | | | | | | Make sure that waitForReadyRead times out if the read buffer is full. Task-number: QTBUG-16123 Reviewed-by: Peter Hartmann (cherry picked from commit 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
* Fix compile warning on WindowsMartin Petersson2011-05-021-0/+1
| | | | | Reviewed-by: Prasanth Ullattil (cherry picked from commit 800ad68e4f000e65b0a83ef1da2a29d595964156)
* Fix the target for QtUiTools debug on MacPrasanth Ullattil2011-04-271-2/+0
|
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-2766-55/+67
|
* Added QT.<module>.imports support to module profiles.axis2011-04-2710-0/+10
|
* Avoid recursively including the same arch.pri filePrasanth Ullattil2011-04-271-1/+3
|
* Include headers.pri from the last path in MODULE_INCLUDESPrasanth Ullattil2011-04-271-1/+4
|
* Use correct DESTDIR for UiTools.axis2011-04-271-0/+1
|
* Move uitools from QtTools to QtBaseLiang Qi2011-04-274-7/+37
|
* 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
* Made the internal support for Qt3Support in QtGui compile.axis2011-04-272-2/+2
|
* Extended module profiles.axis2011-04-279-0/+9
| | | | Each module now sets the QT_CONFIG variable itself.
* Add hardcoded qclass_lib_map.h based on 4.8Marius Storm-Olsen2011-04-271-0/+1437
| | | | This is only until UIC/Designer handles this properly
* Move QtSvg into a separate repositoryLiang Qi2011-04-274-21/+2
|
* 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
|
* Make modules compile without hardcoded pathsMarius Storm-Olsen2011-04-272-1/+5
|
* Make qt.prf use new qt_module.pri structure for QT variableMarius Storm-Olsen2011-04-271-1/+3
| | | | This change requires the new resolve_depends(var, prefix) function in qmake.
* 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.
* Some changes for qtbaseMarius Storm-Olsen2011-04-274-80/+5
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-274506-0/+3239825
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