Updated windows ce documentationv5.1.1

Change-Id: Ic4a6779689c9dd567611ef01b1ac64cf177636e6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

6 files changed, 32 insertions, 148 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index f53779729..fba4f2b14 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -411,7 +411,7 @@ Qt for Windows CE has some requirements that are given in more detail
 in the \l{Qt for Windows CE Requirements} document.
 
 \section1 Step 1: Install the License File (commercial editions only)
-    Uncompress the files into the directory you want to install Qt into;
+    Uncompress the files to the directory where you want to build;
     e.g., \c{C:\Qt\%VERSION%}.
 
     \note The install path must not contain any spaces.
@@ -421,20 +421,12 @@ in the \l{Qt for Windows CE Requirements} document.
     In order to build and use Qt, the \c PATH environment variable needs
     to be extended:
 
-\snippet snippets/code/doc_src_installation.qdoc 18
-    This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable.
-
-    For newer versions of Windows, \c PATH can be extended through
-    "Control Panel->System->Advanced->Environment variables" and for
-    older versions by editing \c{c:\autoexec.bat}.
-
     Make sure the environment variables for your compiler are set.
-    Visual Studio includes \c{vcvars32.bat} for that purpose - or simply
-    use the "Visual Studio Command Prompt" from the Start menu.
+    Or simply use the "\gui{Visual Studio Command Prompt}" from the Start menu.
 
 \section1 Step 3: Configure Qt
 
-    To configure Qt for Windows Mobile 5.0 for Pocket PC, type the
+    To configure Qt, for a custom SDK, type the
     following:
 
 \snippet snippets/code/doc_src_installation.qdoc 19
@@ -446,25 +438,13 @@ in the \l{Qt for Windows CE Requirements} document.
 
 \section1 Step 4: Build Qt Library
 
-    Now, to build Qt you first have to update your \c PATH, \c INCLUDE
-    and \c LIB paths to point to the correct resources for your target
-    platforms. For a default installation of the Windows Mobile 5.0
-    Pocket PC SDK, this is done with the following commands:
-
-\snippet snippets/code/doc_src_installation.qdoc 20
-
-    We provide a convenience script for this purpose, called \c{setcepaths}.
-    Simply type:
-
-\snippet snippets/code/doc_src_installation.qdoc 21
-
-    Then to build Qt type:
+    To build Qt type:
 
     \snippet snippets/code/doc_src_installation.qdoc 22
 
 \b{That's all. Qt is now installed.}
 
-\section1 Qt Demos and Examples
+\section1 Qt Examples
 
     To get started with Qt, you can check out the examples found in the
     \c{examples} directory of your Qt installation. The documentation can
@@ -936,43 +916,8 @@ in the \l{Qt for Windows CE Requirements} document.
     \brief Setting up the Windows CE environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt is known to work with Visual Studio 2005/2008/2010 and the following SDKs for
-    Windows CE development on Windows XP and Windows Vista:
-
-    \list
-        \li  Windows CE 5.0 Standard SDK for ARM, X86, and MIPS
-        \li  Windows CE 6.0 SDKs for ARM generated using the defaults found in
-            Platform Builder
-        \li  Windows Mobile 5.0 (\e{Pocket PC}, \e{Smartphone} and
-            \e{Pocket PC with Phone} editions)
-        \li  Windows Mobile 6.0 (\e{Standard}, \e{Classic} and
-            \e{Professional} editions)
-    \endlist
-
-    Below is a list of links to download the SDKs:
-
-    \list
-        \li \l{http://www.microsoft.com/downloads/details.aspx?familyid=fa1a3d66-3f61-4ddc-9510-ae450e2318c3&displaylang=en}
-            {Windows CE 5 Standard SDK}
-        \li  \l{http://www.microsoft.com/downloads/details.aspx?familyid=83A52AF2-F524-4EC5-9155-717CBE5D25ED&displaylang=en}
-            {Windows Mobile 5 Pocket PC}
-        \li  \l{http://www.microsoft.com/downloads/details.aspx?familyid=DC6C00CB-738A-4B97-8910-5CD29AB5F8D9&displaylang=en}
-            {Windows Mobile 5 Smartphone}
-        \li  \l{http://www.microsoft.com/downloads/details.aspx?familyid=06111A3A-A651-4745-88EF-3D48091A390B&displaylang=en}
-            {Windows Mobile 6 Professional/Standard}
-    \endlist
-
-    \b{Note:}
-    \table
-        \row
-            \li
-            \list 1
-                \li Currently, there is only compile support for Windows CE 5.0
-                   Standard SDK for SH-4.
-                \li There is currently no "out of the box" support for the
-                   Windows CE Automotive or Portable Media SDKs from Microsoft.
-            \endlist
-    \endtable
+    Qt is known to work with Visual Studio 2005/2008 and SDKs for
+    Windows CE 6/7 development on Windows XP and newer:
 
     Device manufacturers may prefer to make their own customized version of
     Windows CE using Platform Builder. In order for Qt for Windows CE to
@@ -987,15 +932,9 @@ in the \l{Qt for Windows CE Requirements} document.
             \li Microsoft Visual Studio 2005 (Standard Edition) or higher
             \li ActivePerl
         \endlist
-        \li Footprint
-        \list
-            \li Lean configuration - 4.8 MB
-            \li Full configuration - 8.4 MB
-        \endlist
         \li Operating Systems
         \list
-            \li Windows CE 5 or higher
-            \li Windows Mobile 5 or higher
+            \li Windows Embedded Compact  6 and 7
         \endlist
         \li Hardware Platform
         \list
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index a97bf152d..a93ae60c1 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -304,7 +304,7 @@
     You can develop with Qt for the following embedded platforms:
     \list
         \li Embedded Linux (DirectFB, EGLFS, KMS, and Wayland)
-        \li Windows Embedded (Compact and Standard)
+        \li \l{Windows CE - Introduction to using Qt}{Windows Embedded (Compact and Standard)}
         \li Real-Time Operating Systems, such as \l{QNX}, VxWorks and INTEGRITY
     \endlist
 
diff --git a/doc/src/platforms/wince-customization.qdoc b/doc/src/platforms/wince-customization.qdoc
index f456764e7..542d8f247 100644
--- a/doc/src/platforms/wince-customization.qdoc
+++ b/doc/src/platforms/wince-customization.qdoc
@@ -65,54 +65,30 @@
     \li \b{CE_ARCH} specifies information about the target architecture.
     \endlist
 
-    Following is an example configuration for the Windows Mobile 5 for 
-    Pocket PC SDK:
+    Following is an example configuration for a custom SDK we call "CustomSDK":
 
     \snippet snippets/code/doc_src_wince-customization.qdoc 1
 
-    \note \l{qmake} uses this information to build a valid Visual Studio
-    project file. You need to ensure that they are identical to the
-    configuration of the custom SDK, otherwise you might not be able to compile
-    or debug your project with Visual Studio.
+    \note Running \l qmake to generate Visual Studio project files for Windows CE currently does not produce valid output..
 
     Additionally, most Windows CE SDKs use extra compiler options. These
     can be specified by expanding the \c DEFINES value.
 
-    For example, with Windows Mobile 5 for Pocket PC, the \c DEFINES variable
+    For example, with CustomSDK, the \c DEFINES variable
     is expanded in the following way:
 
     \snippet snippets/code/doc_src_wince-customization.qdoc 2
 
-    The mkspec may require additional configuration to be used inside of Visual
-    Studio, depending on the Windows CE SDK. The above example defines
-    \c _M_ARM. This definition is available internally in Visual Studio. Hence,
-    the compiler will warn you about redefinition during the build step. These
-    warnings can be disabled by adding a \c default_post.prf file containing
-    the following lines, within the subdirectory.
-
-    \snippet snippets/code/doc_src_wince-customization.qdoc 8
-
 
     \section1 Cross-compilation Environment for a Custom SDK
 
-    Qt for Windows CE supports a convenience script, \c{setcepaths.bat}, that
-    prepares the environment in a command prompt for cross-compilation.
-    However, on custom SDKs, the \c checksdk tool is provided to identify the
-    environment, so Qt compiles successfully.
-
-    \c checksdk is generated during the \c configure step and allows for the
-    following options:
+    Qt for Windows CE only requires that the mkspec that is specified
+    with -xplatform is setup as mentioned \l{Fine-Tuning Options}{above}.
 
-    \list
-        \li  \c list: Returns a list of available Windows CE SDKs. (This list
-            may contain one or more SDKs not supported on Qt for Windows CE,
-            e.g., Pocket PC 2003.)
-        \li  \c sdk: The parameter to specify an SDK. Returns a setup of
-            environment variables that must be set to cross-compile Qt.
-        \li  \c script: Stores your setup in a \c{.bat} file. This simplifies
-            the process of switching environments when you load a command
-            prompt in future.
-    \endlist
+    The selection of the custom SDK environment will happen by concatenating \c CE_SDK
+    and \c CE_ARCH. This builds a string that can be found in "\e{%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcpackages\WCE.VCPlatform.xml}"
+    and contains the correct environment. If you are unsure about the SDK name and Arch for your
+    SDK you can find it in this file.
 
 
     \section1 Compiling Qt for a Custom SDK
@@ -120,7 +96,10 @@
     Windows CE is highly customizable, hence it is possible that some SDKs have
     feature-stripped setups. Depending on the SDK's configuration, Qt may not
     compile in its standard configuration, as Qt for Windows CE is designed to
-    be compatible with the Standard SDK setup.
+    be compatible with the Standard SDK setup. Every Makefile qmake generates
+    that is not flagged to build for the host system will build WindowsCE projects
+    for the SDK Qt was built with. There is no need to set a custom environment
+    besides the Visual Studio 2005/2008 environment.
 
     However, it is possible to exclude features of Qt and create a version that
     compiles for the desired SDK.
@@ -197,15 +176,10 @@
     \li The original Qt source package must be left untouched - configure must
     never have been run in the source tree directory.
 
-    \li The shadow build directory must be on the same level as the Qt source
-        package.\br
-    If the Qt package is in \c{C:\Qt\%VERSION%} the shadow build directory
-    could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
-    \c{C:\shadowbuild} will not compile.
+    \li With Qt5, the code has to be checked out of the git repository, otherwise
+        the out of source build will fail as syncqt is not executed.
     \li Avoid using "release" and "debug" in the path to the shadow build
     directory. (This is an internal limitation of the build system.)
-    \li The \c{\bin} directory of the shadow build directory must be added to the
-    \c PATH environment variable.
     \li Perl has been installed on your system. (\l{ActivePerl} is a popular
     distribution of Perl on Windows.)
     \endlist
@@ -214,9 +188,6 @@
     to create a shadow build in \c{C:\Qt\mobile5-shadow}:
 
     \list
-    \li First add \c{C:\Qt\mobile5-shadow\bin} to the \c PATH variable.
-
-    \snippet snippets/code/doc_src_wince-customization.qdoc 3
 
     \li Make sure the enviroment variables for your compiler are set.
 
@@ -227,18 +198,6 @@
 
     \snippet snippets/code/doc_src_wince-customization.qdoc 4
 
-    \li To build Qt, you have to update your \c{PATH, INCLUDE} and \c LIB paths
-    to point to your target platforms.
-
-    For a default installation of the Windows Mobile 5.0 Pocket PC SDK, you
-    can do the following:
-
-    \snippet snippets/code/doc_src_wince-customization.qdoc 5
-
-    We have provided a convenience script for this called \c{setcepaths}. Simply
-    type:
-
-    \snippet snippets/code/doc_src_wince-customization.qdoc 6
 
     \li Finally, to build the shadow build type:
 
@@ -246,5 +205,8 @@
 
     \li That's all. You have successfully created a shadow build of Qt in
     \c{C:\Qt\mobile5-shadow}.
+
+    \li Now you can call \c{nmake install} and get a clean installation of Qt
+        in \e{%INSTALLDIR%}.
     \endlist
 */
diff --git a/doc/src/platforms/wince-introduction.qdoc b/doc/src/platforms/wince-introduction.qdoc
index 5f76e2d28..31d451800 100644
--- a/doc/src/platforms/wince-introduction.qdoc
+++ b/doc/src/platforms/wince-introduction.qdoc
@@ -76,9 +76,6 @@
     with Windows CE support. You will need the Professional Edition,
     if you're using Visual Studio 2008.
 
-    We recommend the \e{Windows Mobile 5.0 SDK for Pocket PC} SDK available
-    \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=83a52af2-f524-4ec5-9155-717cbe5d25ed&DisplayLang=en}{here}.
-
     \section1 Installing Qt
 
     Follow the instructions found in \l{Installing Qt for Windows CE}.
@@ -90,19 +87,10 @@
     developing Qt applications for Windows CE compared to any of the
     other platforms supported by Qt.
 
-    Once you have a \c .pro file, there are two ways of building your
-    application. You can either do it on the command line or inside of
-    Visual Studio. To do it on the command line, simply write:
+    Once you have a \c .pro file, you can build from the command line. Simply write:
 
     \snippet snippets/code/doc_src_wince-introduction.qdoc 0
 
-    To build the project inside of Visual Studio, on the command line write:
-
-    \snippet snippets/code/doc_src_wince-introduction.qdoc 1
-
-    then start Visual Studio with the generated \c .vcproj or \c .sln file and
-    select \e{Build project}.
-
     For more information on how to use qmake have a look at the \l
     {qmake Tutorial}.
 
@@ -119,12 +107,6 @@
     ActiveSync or the \e{Remote File Viewer} found in Visual Studio to do
     this.
 
-    Visual Studio can do this step automatically for you as well. If you have
-    built the project inside Visual Studio, simply select \e Deploy and then
-    \e Debug to deploy and then run the application. You can change the
-    device type by changing the \e{Target Device} specified in the
-    Visual Studio toolbar.
-
     Further information on deploying Qt applications for Windows can
     be found in the \l{Deploying an Application on Windows}
     {deployment document}.
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index a4b7c5e2d..8cf605f99 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -146,7 +146,7 @@ PATH               - to locate qmake, moc and other Qt tools
 //! [19]
 C:
 cd \Qt\%VERSION%
-configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
+configure -platform -xplatform wincewm70customsdk-msvc2008
 //! [19]
 
 
@@ -164,6 +164,7 @@ setcepaths wincewm50pocket-msvc2005
 
 //! [22]
 nmake
+nmake install
 //! [22]
 
 
diff --git a/doc/src/snippets/code/doc_src_wince-customization.qdoc b/doc/src/snippets/code/doc_src_wince-customization.qdoc
index 3fa636f4e..13e170f45 100644
--- a/doc/src/snippets/code/doc_src_wince-customization.qdoc
+++ b/doc/src/snippets/code/doc_src_wince-customization.qdoc
@@ -50,7 +50,7 @@ CE_ARCH       = ARMV4I
 
 
 //! [2]
-DEFINES	     += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32_WCE=0x501 $$CE_ARCH _ARMV4I_ armv4i _ARM_ ARM _M_ARM ARM _WIN32 __arm__ Q_OS_WINCE_WM QT_NO_PRINTER QT_NO_PRINTDIALOG
+DEFINES += QT_NO_CLIPBOARD QT_NO_ACCESSIBILITY QT_NO_NATIVE_GESTURES QT_NOSTANDARDSHELL_UI_MODEL _CRT_SECURE_NO_DEPRECATE _WIN32_WCE=0x700 $$CE_ARCH _AMRV7_ armv7 _ARM_
 //! [2]
 
 
@@ -61,7 +61,7 @@ set PATH=C:\Qt\mobile5-shadow\bin;%PATH%
 
 //! [4]
 cd c:\Qt\mobile5-shadow
-C:\Qt\%VERSION%\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
+C:\Qt\%VERSION%\configure.exe -xplatform wincewm50pocket-msvc2005 -prefix %INSTALLDIR%
 //! [4]