summaryrefslogtreecommitdiffstats
path: root/src/winmain
Commit message (Collapse)AuthorAgeFilesLines
* let winmain just use qtcoreOswald Buddenhagen2012-11-021-3/+1
| | | | | | | | this is correct dependency-wise (anything which links to this needs to link qtcore), and just cleaner. Change-Id: I2c49d16fc8a0ee8bc55a3c165993fd1c4e313dab Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless messing with CONFIG+=fix_output_dirsOswald Buddenhagen2012-11-021-1/+0
| | | | | | | | the function is automatically performed by debug_and_release.prf, regardless what we do with this flag. Change-Id: Iddec69b35e0e905fdf4133ee240af37d3a8ada0b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove explicit load(qt_build_config)s from the librariesOswald Buddenhagen2012-10-191-2/+0
| | | | | | | .qmake.conf (and previously .qmake.cache) already does that for us. Change-Id: I06cc01fa45921d7bd66dda7a0f88729faeff37bd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-221-6/+6
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove mentions of borland from project filesOswald Buddenhagen2012-09-191-1/+1
| | | | | Change-Id: I3049b24ae287bee50aca1de06664a2309df69edf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Revert "Use true and false in preference to TRUE and FALSE"Sergio Ahumada2012-09-071-1/+1
| | | | | | | | | | | Even though I really think the change was the right thing to do, it seems like Windows people don't like this change because of some Windows Data Types specific rules. This reverts parts of the commit 56d5c909af6473be64a1ae487b45bd444a9a8553. Change-Id: I2c67d9b1bab36fc63937ef386aef56d2a4472a04 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use true and false in preference to TRUE and FALSESergio Ahumada2012-09-051-1/+1
| | | | | | | | The TRUE and FALSE macros are obsolete and should be replaced with true and false (all lower case) respectively. Change-Id: Iee352e8173500683e6319be0abbf5bacf29016e0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix misnomer: qt_module.prf => qt_build_config.prfOswald Buddenhagen2012-06-191-1/+1
| | | | | | qt_module suggests to be congruent to qt_plugin. Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953
* don't use qt_module_config for winmainOswald Buddenhagen2012-06-191-20/+28
| | | | | | | it is not really a Qt module, and pretending causes some messups. Change-Id: Id0980f7c00d6d176dd4937f8b265b8b571aa1277 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix tabs/whitespacesYuchen Deng2012-05-031-9/+7
| | | | | Change-Id: I4db24b703c69ce99f529c84248d9fe4a19a60a03 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* MSVC: Fix link warning if ship qt library without pdb filesYuchen Deng2012-05-031-0/+5
| | | | | | | | | qtmaind.lib(qtmain_win.obj):-1: warning: LNK4099: PDB 'vc100.pdb' was not found with 'qtmaind.lib(qtmain_win.obj)'; linking object as if no debug info Change-Id: I5d515a240e917f5747ec8ca7dabde1cd1a1b14de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific ↵Oswald Buddenhagen2012-03-081-2/+2
| | | | | | | variables Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | 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: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-231-1/+1
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Windows: fixed qtmain.lib not going to `lib' directoryRohan McGovern2011-07-261-1/+1
| | | | | | | | | | `load(qt_module_config)' clobbers DESTDIR. Rearrange the order so that our setting of DESTDIR works as intended. Change-Id: Id6f02e9fb55069fae9b2a75c9d0f51578b84f4d1 Reviewed-on: http://codereview.qt.nokia.com/2130 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Moved common module profiles to be feature profiles.axis2011-06-051-1/+1
| | | | | | | | | | This enables external modules to also make use of them without having access to the complete QtBase source code. Change-Id: I056e45cba6c6798b76670b8d238dadb2d9f9c092 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/234 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-272-0/+157
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