Resolving merge conflicts

11 files changed, 62 insertions, 335 deletions

diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/dialogs/sipdialog/dialog.cpp
index 9f1b9ad..653b518 100644
--- a/examples/dialogs/sipdialog/dialog.cpp
+++ b/examples/dialogs/sipdialog/dialog.cpp
@@ -90,7 +90,7 @@ Dialog::Dialog()
 //! [Dialog constructor part4]
 
 //! [Dialog constructor part5]
-    connect(button, SIGNAL(pressed()), 
+    connect(button, SIGNAL(clicked()),
         qApp, SLOT(closeAllWindows()));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), 
         this, SLOT(desktopResized(int)));
@@ -111,14 +111,13 @@ void Dialog::reactToSIP()
 {
     QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
 
-    if (desktopGeometry.width() == availableGeometry.width()) {
-        if (desktopGeometry.height() > availableGeometry.height()) {
+    if (desktopGeometry != availableGeometry) {
+        if (windowState() | Qt::WindowMaximized)
             setWindowState(windowState() & ~Qt::WindowMaximized);
-            setGeometry(availableGeometry);
-        } else {
-            setWindowState(windowState() | Qt::WindowMaximized);
-        }
+
+        setGeometry(availableGeometry);
     }
+
     desktopGeometry = availableGeometry;
 }
 //! [reactToSIP() function]
diff --git a/examples/dialogs/sipdialog/main.cpp b/examples/dialogs/sipdialog/main.cpp
index 5fcbfd8..fec6de2 100644
--- a/examples/dialogs/sipdialog/main.cpp
+++ b/examples/dialogs/sipdialog/main.cpp
@@ -48,6 +48,6 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Dialog dialog;
-    dialog.exec();
+    return dialog.exec();
 }
 //! [main() function]
diff --git a/examples/itemviews/puzzle/puzzle.pro b/examples/itemviews/puzzle/puzzle.pro
index e5ee3dd..de17a69 100644
--- a/examples/itemviews/puzzle/puzzle.pro
+++ b/examples/itemviews/puzzle/puzzle.pro
@@ -14,3 +14,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/puzzle
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+wince* {
+   DEPLOYMENT_PLUGIN += qjpeg qgif qtiff
+}
+
diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro
index afd600f..33b79de 100644
--- a/examples/network/googlesuggest/googlesuggest.pro
+++ b/examples/network/googlesuggest/googlesuggest.pro
@@ -3,7 +3,7 @@ SOURCES =   main.cpp searchbox.cpp googlesuggest.cpp
 HEADERS  =  searchbox.h googlesuggest.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest
+target.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest
 INSTALLS += target sources
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index 2040e7c..180571c 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -13,3 +13,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index b21cb17..a30c0bd 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -1,10 +1,13 @@
 TEMPLATE      = subdirs
 SUBDIRS       = imagescaling \
                 map \
-                progressdialog \
                 runfunction \
                 wordcount
 
+!wince* {
+    SUBDIRS += progressdialog
+}
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
diff --git a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
index 1881fce..c216a30 100644
--- a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
+++ b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
@@ -8,3 +8,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
 INSTALLS += target sources
+
+wince*: DEPLOYMENT_PLUGIN += qsqlite
+
diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro
index f5c94d3..fe011d2 100644
--- a/examples/widgets/movie/movie.pro
+++ b/examples/widgets/movie/movie.pro
@@ -9,3 +9,11 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+wince*: {
+   addFiles.sources += *.mng
+   addFiles.path = .
+   DEPLOYMENT += addFiles
+   DEPLOYMENT_PLUGIN += qmng
+}
+
diff --git a/examples/xml/htmlinfo/main.cpp b/examples/xml/htmlinfo/main.cpp
index fcf480b..72aef81 100644
--- a/examples/xml/htmlinfo/main.cpp
+++ b/examples/xml/htmlinfo/main.cpp
@@ -5,7 +5,37 @@
 **
 ** This file is part of the $MODULE$ of the Qt Toolkit.
 **
-** $TROLLTECH_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
diff --git a/examples/xml/saxbookmarks/frankf.xbel b/examples/xml/saxbookmarks/frankf.xbel
deleted file mode 100644
index 07a9463..0000000
--- a/examples/xml/saxbookmarks/frankf.xbel
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel version="1.0">
-    <folder folded="yes">
-        <title>Literate Programming</title>
-        <bookmark href="http://www.vivtek.com/litprog.html">
-            <title>Synopsis of Literate Programming</title>
-        </bookmark>
-        <bookmark href="http://vasc.ri.cmu.edu/old_help/Programming/Literate/literate.html">
-            <title>Literate Programming: Propaganda and Tools</title>
-        </bookmark>
-        <bookmark href="http://www.isy.liu.se/%7Eturbell/litprog/">
-            <title>Literate Programming by Henrik Turbell</title>
-        </bookmark>
-        <bookmark href="http://www.desy.de/user/projects/LitProg.html">
-            <title>Literate Programming Library</title>
-        </bookmark>
-        <bookmark href="http://www.loria.fr/services/tex/english/litte.html">
-            <title>Literate Programming Basics</title>
-        </bookmark>
-        <bookmark href="http://ei.cs.vt.edu/%7Ecs5014/courseNotes/4.LiterateProgramming/literate_prog.html">
-            <title>Literate Programming Overview</title>
-        </bookmark>
-        <bookmark href="http://www.perl.com/pub/a/tchrist/litprog.html">
-            <title>POD is not Literate Programming</title>
-        </bookmark>
-        <bookmark href="http://www.cornellcollege.edu/%7Eltabak/publications/articles/swsafety.html">
-            <title>Computers That We Can Count On</title>
-        </bookmark>
-        <bookmark href="http://www.cs.auc.dk/%7Enormark/litpro/issues-and-problems.html">
-            <title>Literate Programming - Issues and Problems</title>
-        </bookmark>
-        <bookmark href="http://c2.com/cgi/wiki?LiterateProgramming">
-            <title>Literate Programming - Wiki Pages</title>
-        </bookmark>
-        <bookmark href="http://developers.slashdot.org/developers/02/05/19/2216233.shtml">
-            <title>What is well-commented code?</title>
-        </bookmark>
-        <bookmark href="http://liinwww.ira.uka.de/bibliography/SE/litprog.html">
-            <title>Bibliography on literate programming - A searchable bibliography</title>
-        </bookmark>
-        <bookmark href="http://www2.umassd.edu/SWPI/ProcessBibliography/bib-codereading.html">
-            <title>Program comprehension and code reading bibliography</title>
-        </bookmark>
-        <bookmark href="http://www.cs.auc.dk/%7Enormark/elucidative-programming/">
-            <title>Elucidative Programming</title>
-        </bookmark>
-        <bookmark href="http://www.msu.edu/%7Epfaffben/avl/index.html">
-            <title>AVL Trees (TexiWeb)</title>
-        </bookmark>
-        <bookmark href="http://literate-programming.wikiverse.org/">
-            <title>Literate Programming on Wikiverse</title>
-        </bookmark>
-        <bookmark href="http://www.pbrt.org/">
-            <title>Physically Based Rendering: From Theory to Implementation</title>
-        </bookmark>
-    </folder>
-    <folder folded="no">
-        <title>Useful C++ Links</title>
-        <folder folded="no">
-            <title>STL</title>
-            <bookmark href="http://www.sgi.com/tech/stl/table_of_contents.html">
-                <title>STL Reference Documentation</title>
-            </bookmark>
-            <bookmark href="http://www.yrl.co.uk/~phil/stl/stl.htmlx">
-                <title>STL Tutorial</title>
-            </bookmark>
-            <bookmark href="http://www.cppreference.com/cpp_stl.html">
-                <title>STL Reference</title>
-            </bookmark>
-        </folder>
-        <folder folded="no">
-            <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
-                <title>Qt 2.3 Reference</title>
-            </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
-                <title>Qt 3.3 Reference</title>
-            </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
-                <title>Qt 4.0 Reference</title>
-            </bookmark>
-            <bookmark href="http://www.trolltech.com/">
-                <title>Trolltech Home Page</title>
-            </bookmark>
-        </folder>
-        <folder folded="yes">
-            <title>IOStreams</title>
-            <bookmark href="http://www.cplusplus.com/ref/iostream/index.html">
-                <title>IO Stream Library</title>
-            </bookmark>
-            <bookmark href="http://courses.cs.vt.edu/~cs2604/fall01/binio.html">
-                <title>Binary I/O</title>
-            </bookmark>
-            <bookmark href="http://www.parashift.com/c++-faq-lite/input-output.html">
-                <title>I/O Stream FAQ</title>
-            </bookmark>
-        </folder>
-        <folder folded="yes">
-            <title>gdb</title>
-            <bookmark href="http://www.cs.princeton.edu/~benjasik/gdb/gdbtut.html">
-                <title>GDB Tutorial</title>
-            </bookmark>
-            <bookmark href="http://www.gnu.org/manual/gdb-4.17/html_mono/gdb.html">
-                <title>Debugging with GDB</title>
-            </bookmark>
-            <bookmark href="http://www.cs.washington.edu/orgs/acm/tutorials/dev-in-unix/gdb-refcard.pdf">
-                <title>GDB Quick Reference Page (PDF) (Handy)</title>
-            </bookmark>
-        </folder>
-        <folder folded="yes">
-            <title>Classes and Constructors</title>
-            <bookmark href="http://www.parashift.com/c++-faq-lite/ctors.html">
-                <title>Constructor FAQ</title>
-            </bookmark>
-            <bookmark href="http://www.juicystudio.com/tutorial/cpp/index.html">
-                <title>Organizing Classes</title>
-            </bookmark>
-        </folder>
-    </folder>
-    <folder folded="yes">
-        <title>Software Documentation or System Documentation</title>
-        <bookmark href="http://www.martinfowler.com/distributedComputing/thud.html">
-            <title>The Almighty Thud</title>
-        </bookmark>
-        <bookmark href="http://msdn.microsoft.com/library/techart/cfr.htm">
-            <title>Microsoft Coding Techniques and Programming Practices</title>
-        </bookmark>
-        <bookmark href="http://www.bearcave.com/software/prog_docs.html">
-            <title>Software and Documentation</title>
-        </bookmark>
-        <bookmark href="http://c2.com/cgi/wiki?TheSourceCodeIsTheDesign">
-            <title>The Source Code is the Design</title>
-        </bookmark>
-        <bookmark href="http://www.bleading-edge.com/Publications/C++Journal/Cpjour2.htm">
-            <title>What is Software Design?</title>
-        </bookmark>
-        <bookmark href="http://www.mindprod.com/unmain.html">
-            <title>How To Write Unmaintainable Code</title>
-        </bookmark>
-        <bookmark href="http://www.idinews.com/selfDoc.html">
-            <title>Self Documenting Program Code Remains a Distant Goal</title>
-        </bookmark>
-        <bookmark href="http://www.sdmagazine.com/documents/s=730/sdm0106m/0106m.htm">
-            <title>Place Tab A in Slot B</title>
-        </bookmark>
-        <bookmark href="http://www.holub.com/class/uml/uml.html">
-            <title>UML Reference Card</title>
-        </bookmark>
-    </folder>
-    <folder folded="yes">
-        <title>TeX Resources</title>
-        <bookmark href="http://www.tug.org/">
-            <title>The TeX User's Group</title>
-        </bookmark>
-        <bookmark href="http://www.miktex.org/">
-            <title>MikTeX website</title>
-        </bookmark>
-        <bookmark href="http://cm.bell-labs.com/who/hobby/MetaPost.html">
-            <title>MetaPost website</title>
-        </bookmark>
-        <bookmark href="http://pauillac.inria.fr/%7Emaranget/hevea/">
-            <title>HEVEA is a quite complete and fast LATEX to HTML translator</title>
-        </bookmark>
-    </folder>
-    <folder folded="no">
-        <title>Portable Document Format (PDF)</title>
-        <bookmark href="http://www.adobe.com/">
-            <title>Adobe - The postscript and PDF standards</title>
-        </bookmark>
-        <bookmark href="http://partners.adobe.com/asn/developer/technotes/acrobatpdf.html">
-            <title>Reference Manual Portable Document Format</title>
-        </bookmark>
-        <bookmark href="http://partners.adobe.com/asn/developer/acrosdk/main.html">
-            <title>Adobe Acrobat Software Development Kit</title>
-        </bookmark>
-    </folder>
-    <folder folded="yes">
-        <title>Literature Sites</title>
-        <bookmark href="http://www.cc.columbia.edu/cu/libraries/subjects/speccol.html">
-            <title>Guide to Special Collections (Columbia University)</title>
-        </bookmark>
-        <bookmark href="http://www.ipl.org/ref/litcrit/">
-            <title>Literary Criticism on the Web from the Internet Public Library</title>
-        </bookmark>
-        <bookmark href="http://www.victorianweb.org/">
-            <title>Victorian Web.</title>
-        </bookmark>
-        <bookmark href="http://vos.ucsb.edu/">
-            <title>Voice of the Shuttle.</title>
-        </bookmark>
-        <bookmark href="http://www.modjourn.brown.edu/">
-            <title>Modernist Journals Project</title>
-        </bookmark>
-        <bookmark href="http://www.poetspath.com">
-            <title>Museum of American Poetics</title>
-        </bookmark>
-        <bookmark href="http://www.english.uiuc.edu/maps/">
-            <title>Modern American Poetry</title>
-        </bookmark>
-        <bookmark href="http://www.findarticles.com/">
-            <title>FindArticles.com</title>
-        </bookmark>
-        <bookmark href="http://www.literaryhistory.com">
-            <title>Literary History</title>
-        </bookmark>
-        <bookmark href="http://www.litencyc.com/LitEncycFrame.htm">
-            <title>Literary Encyclopedia</title>
-        </bookmark>
-        <separator/>
-        <bookmark href="http://texts.cdlib.org/ucpress/">
-            <title>The University of California Press</title>
-        </bookmark>
-        <bookmark href="http://www.letrs.indiana.edu/web/w/wright2/">
-            <title>Wright American Fiction, 1851-1875</title>
-        </bookmark>
-        <bookmark href="http://docsouth.unc.edu/">
-            <title>Documenting the American South: Beginnings to 1920</title>
-        </bookmark>
-        <bookmark href="http://etext.lib.virginia.edu/eng-on.html">
-            <title>Electronic Text Center at the University of Virginia</title>
-        </bookmark>
-        <bookmark href="http://digital.nypl.org/schomburg/writers_aa19/">
-            <title>The Schomburg Center for Research in Black Culture</title>
-        </bookmark>
-        <bookmark href="http://www.infomotions.com/alex2/">
-            <title>Alex Catalogue of Electronic Texts.</title>
-        </bookmark>
-    </folder>
-</xbel>
diff --git a/examples/xml/saxbookmarks/jenniferf.xbel b/examples/xml/saxbookmarks/jenniferf.xbel
deleted file mode 100644
index 1f7810b..0000000
--- a/examples/xml/saxbookmarks/jenniferf.xbel
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel version="1.0">
-    <folder folded="no">
-        <title>Qt Resources</title>
-        <folder folded="yes">
-            <title>Trolltech Partners</title>
-            <bookmark href="http://partners.trolltech.com/partners/training.html">
-                <title>Training Partners</title>
-            </bookmark>
-            <bookmark href="http://partners.trolltech.com/partners/service.html">
-                <title>Consultants and System Integrators</title>
-            </bookmark>
-            <bookmark href="http://partners.trolltech.com/partners/tech.html">
-                <title>Technology Partners</title>
-            </bookmark>
-            <bookmark href="http://partners.trolltech.com/partners/resellers.html">
-                <title>Value Added Resellers (VARs)</title>
-            </bookmark>
-        </folder>
-        <folder folded="yes">
-            <title>Community Resources</title>
-            <bookmark href="http://www.qtforum.org/">
-                <title>QtForum.org</title>
-            </bookmark>
-            <bookmark href="http://www.digitalfanatics.org/projects/qt_tutorial/">
-                <title>The Independent Qt Tutorial</title>
-            </bookmark>
-            <bookmark href="http://prog.qt.free.fr/">
-                <title>French PROG.Qt</title>
-            </bookmark>
-            <bookmark href="http://www.qtforum.de/">
-                <title>German Qt Forum</title>
-            </bookmark>
-            <bookmark href="http://www.korone.net/">
-                <title>Korean Qt Community Site</title>
-            </bookmark>
-            <bookmark href="http://prog.org.ru/forum/forum_14.html">
-                <title>Russian Qt Forum</title>
-            </bookmark>
-            <bookmark href="http://qt4.digitalfanatics.org/">
-                <title>Digitalfanatics: The QT 4 Resource Center</title>
-            </bookmark>
-            <bookmark href="http://www.qtquestions.org/">
-                <title>QtQuestions</title>
-            </bookmark>
-        </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
-            <title>Qt Quarterly</title>
-        </bookmark>
-        <bookmark href="http://www.trolltech.com/">
-            <title>Trolltech's home page</title>
-        </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
-            <title>Qt 4.0 documentation</title>
-        </bookmark>
-        <bookmark href="http://www.trolltech.com/developer/faqs/">
-            <title>Frequently Asked Questions</title>
-        </bookmark>
-    </folder>
-    <folder folded="no">
-        <title>Online Dictionaries</title>
-        <bookmark href="http://www.dictionary.com/">
-            <title>Dictionary.com</title>
-        </bookmark>
-        <bookmark href="http://www.m-w.com/">
-            <title>Merriam-Webster Online</title>
-        </bookmark>
-        <bookmark href="http://dictionary.cambridge.org/">
-            <title>Cambridge Dictionaries Online</title>
-        </bookmark>
-        <bookmark href="http://www.onelook.com/">
-            <title>OneLook Dictionary Search</title>
-        </bookmark>
-        <separator/>
-        <bookmark href="www.iee.et.tu-dresden.de/">
-            <title>The New English-German Dictionary</title>
-        </bookmark>
-        <bookmark href="http://dict.tu-chemnitz.de/">
-            <title>TU Chemnitz German-English Dictionary</title>
-        </bookmark>
-        <separator/>
-        <bookmark href="http://atilf.atilf.fr/tlf.htm">
-            <title>Trésor de la Langue Française informatisé</title>
-        </bookmark>
-        <bookmark href="http://dictionnaires.atilf.fr/dictionnaires/ACADEMIE/">
-            <title>Dictionnaire de l'Académie Française</title>
-        </bookmark>
-        <bookmark href="http://elsap1.unicaen.fr/cgi-bin/cherches.cgi">
-            <title>Dictionnaire des synonymes</title>
-        </bookmark>
-    </folder>
-</xbel>