Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Made sure syncqt gets called correctly even if it is not in the PATH. | axis | 2011-04-27 | 2 | -3/+6 |
| | |||||
* | Changed path references to ActiveQt. | axis | 2011-04-27 | 2 | -0/+7 |
| | |||||
* | Include headers.pri from the last path in MODULE_INCLUDES | Prasanth Ullattil | 2011-04-27 | 1 | -1/+4 |
| | |||||
* | Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. | Prasanth Ullattil | 2011-04-27 | 1 | -2/+2 |
| | |||||
* | Use the 'install_name' linker flag on Mac for the frameworks. | Prasanth Ullattil | 2011-04-27 | 1 | -0/+5 |
| | | | | This is required for the frameworks outside the qtbase module. | ||||
* | Fixed wrong inclusion of QtHelp module. | axis | 2011-04-27 | 1 | -2/+1 |
| | |||||
* | Fixed a bug in libdir handling. | axis | 2011-04-27 | 1 | -1/+2 |
| | | | | | We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because MSVC does not understand -L. | ||||
* | New configure.exe binary | Marius Storm-Olsen | 2011-04-27 | 1 | -0/+0 |
| | |||||
* | Remove hardcoded modules in configure and QT_CONFIG | Marius Storm-Olsen | 2011-04-27 | 1 | -67/+65 |
| | | | | | | | Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe | ||||
* | Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed | Marius Storm-Olsen | 2011-04-27 | 1 | -0/+5 |
| | |||||
* | Use correct DESTDIR for UiTools. | axis | 2011-04-27 | 1 | -0/+1 |
| | |||||
* | Move uitools from QtTools to QtBase | Liang Qi | 2011-04-27 | 13 | -15/+160 |
| | |||||
* | Demos: activate in profiles | Olivier Goffart | 2011-04-27 | 1 | -15/+0 |
| | |||||
* | Make auto test build | Liang Qi | 2011-04-27 | 1 | -10/+0 |
| | |||||
* | examples.pro removed moved subdirectories | Olivier Goffart | 2011-04-27 | 1 | -6/+0 |
| | |||||
* | Make each module refer to its own bin/ | Marius Storm-Olsen | 2011-04-27 | 11 | -3/+16 |
| | | | | | | | 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 modules that depend on other modules add their include paths. | Marius Storm-Olsen | 2011-04-27 | 1 | -0/+6 |
| | | | | | | | | This is needed so that header files which contain references to those modules (for example in templates) will have their include paths as well. RevBy: axis | ||||
* | Made the internal support for Qt3Support in QtGui compile. | axis | 2011-04-27 | 2 | -2/+2 |
| | |||||
* | Made syncqt collapse redundant ".." sections in paths. | axis | 2011-04-27 | 1 | -0/+2 |
| | |||||
* | Fixed useless substitution in syncqt. | axis | 2011-04-27 | 1 | -1/+0 |
| | | | | | The substitution is not necessary and messes up the argument that is passed in. | ||||
* | Corrected include path for UiTools. | axis | 2011-04-27 | 1 | -1/+1 |
| | |||||
* | Extended module profiles. | axis | 2011-04-27 | 10 | -28/+40 |
| | | | | Each module now sets the QT_CONFIG variable itself. | ||||
* | Add hardcoded qclass_lib_map.h based on 4.8 | Marius Storm-Olsen | 2011-04-27 | 2 | -1/+1438 |
| | | | | This is only until UIC/Designer handles this properly | ||||
* | Move QtSvg into a separate repository | Liang Qi | 2011-04-27 | 5 | -24/+2 |
| | |||||
* | Add the private_includes path to the modules .pri file | Liang Qi | 2011-04-27 | 10 | -0/+10 |
| | |||||
* | Add the source path to the modules .pri file | Marius Storm-Olsen | 2011-04-27 | 11 | -0/+11 |
| | |||||
* | Remove the hardcode QT_CONFIG in those pri files. | Liang Qi | 2011-04-27 | 10 | -20/+0 |
| | |||||
* | Make modules compile without hardcoded paths | Marius Storm-Olsen | 2011-04-27 | 2 | -1/+5 |
| | |||||
* | Make qt.prf use new qt_module.pri structure for QT variable | Marius Storm-Olsen | 2011-04-27 | 3 | -72/+82 |
| | | | | This change requires the new resolve_depends(var, prefix) function in qmake. | ||||
* | Add resolve_depends(var, prefix) function to qmake | Marius Storm-Olsen | 2011-04-27 | 2 | -1/+46 |
| | | | | | | | | | | | | | | This function calculates the topological order of variables. We will use it to determine which and in what order to link module libraries. The function is not tied to libraries/modules only, but requires the variables to be ordered to have their dependencies in the [prefix]<var>.depends subvariable. Due to the recursive nature of the algorithm it was just much easier to implement it directly in C++ rather than in a qmake-language function. | ||||
* | Add module specific pris, and make syncqt create fwd includes | Marius Storm-Olsen | 2011-04-27 | 13 | -4/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | Have qmake run syncqt automatically, if sync.profile is detected | Marius Storm-Olsen | 2011-04-27 | 1 | -0/+28 |
| | | | | | | | This will normally only happen for top-level pro files, and syncqt is smart enough to not touch already existing files. And in edition, syncqt uses the original file's timestamp on the fwding files. | ||||
* | Fixup: not paths for other modules | Marius Storm-Olsen | 2011-04-27 | 1 | -1/+1 |
| | |||||
* | Moved symbianpkgrules profiles to be feature profiles. | axis | 2011-04-27 | 2 | -5/+0 |
| | |||||
* | Make syncqt use sync.profile files from each module | Marius Storm-Olsen | 2011-04-27 | 4 | -84/+130 |
| | | | | | 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 Qi | 2011-04-27 | 1 | -1/+4 |
| | |||||
* | Expose source and build directories for QtBase | Marius Storm-Olsen | 2011-04-27 | 3 | -70/+121 |
| | | | | Also expose moc, uic, rcc, qdbusxml2cpp, include and lib | ||||
* | Some changes for qtbase | Marius Storm-Olsen | 2011-04-27 | 8 | -131/+11 |
| | |||||
* | Moved to using a feature profile instead of direct inclusion. | axis | 2011-04-27 | 237 | -237/+237 |
| | |||||
* | Initial import from the monolithic Qt. | Qt by Nokia | 2011-04-27 | 20396 | -0/+5766086 |
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 |