4 years agoCompile MSVC2010. ERROR is defined in wingdi.h. master
Jan Arve Saether [Thu, 17 Oct 2013 20:35:41 +0000 (22:35 +0200)]
Compile MSVC2010. ERROR is defined in wingdi.h.

Small additional benefit is that this should also speed up
preprocessing, as including QtCore was a bit too greedy...

For future reference: An alternative fix is to define NOGDI before
including windows.h.

Change-Id: I282d4f26624dc38abf3f98b847ccebea5983d331
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
5 years agoFix copyright year and regenerated the parser.
Erik Verbruggen [Fri, 9 Aug 2013 10:09:39 +0000 (12:09 +0200)]
Fix copyright year and regenerated the parser.

Change-Id: Idb30a6b567d36f21d4d35bac51c0241742c42c44
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoCopyright change
Teemu Kaukoranta [Tue, 28 May 2013 11:33:08 +0000 (14:33 +0300)]
Copyright change

Had to change one copyright manually

Change-Id: I6be69acc057111834876e302caf4ec201d41f438
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoadd .qmake.conf
Oswald Buddenhagen [Mon, 3 Dec 2012 17:26:32 +0000 (18:26 +0100)]
add .qmake.conf

for consistency with other qt modules, so top-level "make docs" does not
bail out.

Change-Id: I911a5037ed047d1e801e10eefea653d376282ec1
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoChanged the *generated* copyright not state the module.
Erik Verbruggen [Thu, 22 Nov 2012 08:52:41 +0000 (09:52 +0100)]
Changed the *generated* copyright not state the module.

As qlalr is mostly used to generate parsers which are not part of the
qlalr module, it is much more convenient (and less error prone) to have
the copyright state "This file is part of the Qt Toolkit." instead of
"... is part of the QLALR module".

Change-Id: I08bc6f53bd527d78e6d152803abbeb385caf3e10
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoAdd .qmake.conf with load(qt_build_config) like other Qt modules
Tor Arne Vestbø [Mon, 22 Oct 2012 10:41:55 +0000 (12:41 +0200)]
Add .qmake.conf with load(qt_build_config) like other Qt modules

Change-Id: I99fcf3973262b86d3a19a88cb6d38d47c8bf1c2e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
6 years agoDoc: Adding documentation templates from qtbase
Jerome Pasion [Fri, 21 Sep 2012 12:44:07 +0000 (14:44 +0200)]
Doc: Adding documentation templates from qtbase

Task-number: QTBUG-27293
Change-Id: Ia5d359ea7f1be1f1984ab32d7f214213353b3667
Reviewed-by: Martin Smith <martin.smith@digia.com>
6 years agoChange copyrights from Nokia to Digia
Iikka Eklund [Thu, 20 Sep 2012 05:37:09 +0000 (08:37 +0300)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: Ia6295f46737b542d9d70419e9db2a9e4c69a443b
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
6 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 19:40:02 +0000 (21:40 +0200)]
Update the git-archive export options

The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I1c481f4e1c7f00d7f7a03d16b5352ef6ed2b8e2d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoRemove the usage of deprecated qdoc macros. v5.0.0-beta1
Casper van Donderen [Thu, 1 Mar 2012 12:29:19 +0000 (13:29 +0100)]
Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold and
list items. This change applies that change in QDoc to the actual

Task-number: QTBUG-24578
Change-Id: I3feb5e9fb32826213db4ab00dfb4df478d657034
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
6 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 02:33:07 +0000 (12:33 +1000)]
Remove "All rights reserved" line from license headers.

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: I68bbcebeeddd84af30cb3361e5568193bb391817
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoUpdate obsolete contact address.
Jason McDonald [Fri, 20 Jan 2012 03:37:49 +0000 (13:37 +1000)]
Update obsolete contact address.

Replace Nokia contact email address with Qt Project website.

Change-Id: Id82ca8a75bb45203efc6f7b714256594ab3f5341
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoRemove out-of-line uses of qMalloc/qFree/qRealloc.
Robin Burchell [Fri, 6 Jan 2012 17:56:17 +0000 (18:56 +0100)]
Remove out-of-line uses of qMalloc/qFree/qRealloc.

Per http://codereview.qt-project.org/#change,11562, we are trying to remove these
in favour of direct allocation, or (in the case of inline code) specialised
out-of-line wrappers.

Change-Id: I4d6580da66b9e1bd27a1d0c78f757ccf0aa7c034
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
6 years agoUpdate copyright year in license headers.
Jason McDonald [Thu, 5 Jan 2012 04:46:36 +0000 (14:46 +1000)]
Update copyright year in license headers.

Change-Id: I9f69b11c48b84d2e9187d40e64caeb5b0e9717c3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoRemove trolltech-logo.png.
Jason McDonald [Tue, 20 Dec 2011 04:46:05 +0000 (14:46 +1000)]
Remove trolltech-logo.png.

This file contained the old Trolltech logo.  Make the docs use the Qt
logo instead.

Task-number: QTBUG-19653
Change-Id: If547114113ae2114524d1d781991c092f37a8215
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoFix warnings about unused variables.
Friedemann Kleint [Wed, 14 Dec 2011 14:09:53 +0000 (15:09 +0100)]
Fix warnings about unused variables.

Change-Id: I56c24e458e929bdf2f4b43a2823cae10d4cb76db
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
7 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:33 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

Change-Id: Ifbdd875648f193d31b98b4114293bd14b318a8f5
Reviewed-on: http://codereview.qt.nokia.com/3366
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
7 years agoEliminate reference to Trolltech in variable name.
Jason McDonald [Tue, 2 Aug 2011 03:38:20 +0000 (13:38 +1000)]
Eliminate reference to Trolltech in variable name.

Task-number: QTBUG-19653

Change-Id: Idbc32c68dbddf3ec8b0e91a736af9108dd8f62fa
Reviewed-on: http://codereview.qt.nokia.com/2475
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
7 years agoUpdate licenseheader text in source files for qlalr Qt module.
Jyri Tahtela [Tue, 24 May 2011 08:31:28 +0000 (11:31 +0300)]
Update licenseheader text in source files for qlalr Qt module.

Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me
7 years agoAdded .tag file with Git revision.
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.

7 years agoAdd .gitignore to each module
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module

7 years agoInitial import from the monolithic Qt.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.

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:


If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"

Branched from the monolithic repo, Qt master branch, at commit