summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL156
-rw-r--r--README.s60184
-rw-r--r--README.wince44
-rw-r--r--dist/README33
-rw-r--r--doc/src/getting-started/installation.qdoc5
-rw-r--r--doc/src/platforms/wince-signing.qdoc96
6 files changed, 127 insertions, 391 deletions
diff --git a/INSTALL b/INSTALL
index 092dea00f0..b62f21da41 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,148 +1,14 @@
INSTALLING Qt Source Package Version %VERSION%.
-1. If you have the commercial edition of Qt, install your license
- file as $HOME/.qt-license if you are on Unix. If you are on
- Windows, copy the license file into your home directory
- (this may be known as the userprofile environment variable) and
- rename it to .qt-license. For example on Windows XP,
- %USERPROFILE% should be something like C:\Documents and
- Settings\username.
+For full installation instructions for each supported platform, please
+see http://qt.nokia.com/doc/%VERSION%/installation.html, the file
+doc/html/installation.html in this package, or follow one of the following
+links:
+
+Embedded Linux: http://qt.nokia.com/doc/%VERSION%/qt-embedded-install.html
+Mac OS X: http://qt.nokia.com/doc/%VERSION%/install-mac.html
+Windows: http://qt.nokia.com/doc/%VERSION%/install-win.html
+Windows CE: http://qt.nokia.com/doc/%VERSION%/install-wince.html
+X11 Platforms: http://qt.nokia.com/doc/%VERSION%/install-x11.html
+Symbian Platform: http://qt.nokia.com/doc/%VERSION%/install-symbian.html
- For the open source version you do not need a license file.
-
-2. Unpack the archive if you have not done so already:
-
- On Unix (X11 and Mac):
- cd /tmp
- gunzip %DISTNAME%.tar.gz # uncompress the archive
- tar xvf %DISTNAME%.tar # unpack it
-
- This creates the directory /tmp/%DISTNAME% containing the files
- from the archive. We only support the GNU version of the tar
- archiving utility. Note that on some systems it is called gtar.
-
- On Windows, uncompress the files into the directory you want Qt
- installed, e.g. C:\Qt\%VERSION%.
-
- NOTE: The install path must not contain any spaces.
-
-4. Environment variables
-
- In order to build and use Qt, the PATH environment variable needs
- to be extended to locate qmake, moc and other Qt tools
-
- On Windows, this is done by adding C:\Qt\%VERSION%\bin
- to the PATH variable. On Unix, this is done by adding
- /tmp/%DISTNAME%.
-
- For newer versions of Windows, PATH can be extended through
- "Control Panel->System->Advanced->Environment variables" and for
- older versions by editing C:\autoexec.bat.
-
- In .profile (if your Unix shell is bash), add the following lines:
-
- PATH=/usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
- export PATH
-
- In .login (in case your Unix shell is csh or tcsh), add the following line:
-
- setenv PATH /usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
-
- If you use a different Unix shell, please modify your environment
- variables accordingly.
-
- For some X11 compilers that do not support rpath you must also
- extended the LD_LIBRARY_PATH environment variable to include
- /usr/local/Trolltech/Qt-%VERSION%/lib. On Linux or Mac with GCC
- this step is not needed.
-
-4. Building
-
-4.1 Building on Unix
-
- To configure the Qt library for your machine type, run the
- ./configure script in the package directory.
-
- By default, Qt is configured for installation in the
- /usr/local/Trolltech/Qt-%VERSION% directory, but this can be
- changed by using the -prefix option.
-
- cd /tmp/%DISTNAME%
- ./configure
-
- Type "./configure -help" to get a list of all available options.
-
- To create the library and compile all the demos, examples, tools,
- and tutorials, type:
-
- make
-
- If you did not configure Qt using the -prefix-install option,
- you need to install the library, demos, examples, tools, and
- tutorials in the appropriate place. To do this, type:
-
- su -c "make install"
-
- and enter the root password. On some systems, you have to use the
- sudo command as follows:
-
- sudo make install
-
- and enter your password, this requires that you have administrator access
- to your machine.
-
- Note that on some systems the make utility is named differently,
- e.g. gmake. The configure script tells you which make utility to
- use.
-
- If you need to reconfigure and rebuild Qt from the same location,
- ensure that all traces of the previous configuration are removed
- by entering the build directory and typing
-
- make confclean
-
- before running the configure script again.
-
-4.2 Building on Windows
-
- To configure the Qt library for your machine type:
-
- C:
- cd \Qt\%VERSION%
- configure
-
- Type "configure -help" to get a list of all available options.
-
- If you are using the "-direct3d" option, make sure that you have
- the Direct3D SDK installed, and that you have run the
- %DXSDK_DIR%\Utilities\Bin\dx_setenv.cmd command, before attempting
- to run configure.
-
- The actual commands needed to build Qt depends on your development
- system. For Microsoft Visual Studio to create the library and
- compile all the demos, examples, tools and tutorials type:
-
- nmake
-
- If you need to reconfigure and rebuild Qt from the same location,
- ensure that all traces of the previous configuration are removed
- by entering the build directory and typing
-
- nmake confclean
-
- before running the configure script again.
-
-5. That's all. Qt is now installed.
-
- If you are new to Qt, we suggest that you take a look at the demos
- and examples to see Qt in action. Run the Qt Examples and Demos
- either by typing 'qtdemo' on the command line or through the
- desktop's Start menu.
-
- You might also want to try the following links:
-
- http://qt.nokia.com/doc/%VERSION%/how-to-learn-qt.html
- http://qt.nokia.com/doc/%VERSION%/tutorial.html
- http://qt.nokia.com/developer
-
- We hope you will enjoy using Qt. Good luck!
diff --git a/README.s60 b/README.s60
deleted file mode 100644
index 2137135d03..0000000000
--- a/README.s60
+++ /dev/null
@@ -1,184 +0,0 @@
-This is Qt version %VERSION%.
-
-Qt is a comprehensive cross-platform C++ application framework. With
-this pre-release you can make advanced graphical applications and
-utilize TCP/IP connections. More specifically, these modules are now
-available for S60:
-
-QtCore - http://doc.trolltech.com/4.6-snapshot/qtcore.html
-QtGui - http://doc.trolltech.com/4.6-snapshot/qtgui.html
-QtNetwork - http://doc.trolltech.com/4.6-snapshot/qtnetwork.html
-QtScript - http://doc.trolltech.com/4.6-snapshot/qtscript.html
-QtSql - http://doc.trolltech.com/4.6-snapshot/qtsql.html
-QtSvg - http://doc.trolltech.com/4.6-snapshot/qtsvg.html
-QtTest - http://doc.trolltech.com/4.6-snapshot/qttest.html
-QtWebKit - http://doc.trolltech.com/4.6-snapshot/qtwebkit.html
-QtXml - http://doc.trolltech.com/4.6-snapshot/qtxml.html
-Phonon - http://doc.trolltech.com/4.6-snapshot/phonon-module.html
-
-INSTALLING Qt
-
-Follow the instructions in the INSTALL file.
-
-REFERENCE DOCUMENTATION
-
-The Qt reference documentation is available locally in Qt's doc/html
-directory or at http://doc.trolltech.com/4.6-snapshot/index.html
-
-SUPPORTED PLATFORMS
-
-For this release, the following platforms have been tested:
-
- S60 3.1, 3.2 and 5.0
-
-with these compilers:
-
- WINSCW (Emulator, X86)
- RVCT (Hardware, ARM)
- GCCE (Hardware, ARM)*
-
-The current version of GCCE cannot compile the Qt libraries
-themselves as it has issues with global static data in DLLs.
-However, we supply precompiled Qt libraries compiled with RVCT
-that can be used instead. This makes it possible to write and
-compile Qt applications using GCCE by linking to these
-precompiled binaries. For more information on this issue see:
-http://www3.symbian.com/faq.nsf/0/B8542F039C193CCC802573DA0011DFA7
-
-HOW TO REPORT A BUG
-
-We have set up a special mailinglist for feedback on the S60 port.
-Bug-reports, feedback or questions all go to this list.
-Please go to http://pepper.troll.no/s60prereleases/
-for details on how to subscribe to the list.
-
-Before posting, please consult the FAQ and the list of known issues:
-http://labs.trolltech.com/page/QtforS60FAQ
-http://labs.trolltech.com/page/QtforS60KnownIssues
-
-Always include the following information in your bug report: the name
-and version number of your compiler; the name and version number of
-your operating system; the version of Qt you are using, and what
-configure options it was compiled with.
-
-If the problem you are reporting is only visible at run-time, try to
-create a small test program that shows the problem when run. Often,
-such a program can be created with some minor changes to one of the
-many example programs in Qt's examples directory.
-
-
- INSTALLING Qt for S60 Version %VERSION%
-
-1. Install needed IDE and SDKs
-
- Make sure you have the following installed:
-
- - Carbide.c++ v2.0.0 or higher:
- http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/
-
- Note: It may be necessary to update the Carbide compiler.
- See http://pepper.troll.no/s60prereleases/patches/ for instructions
- how to check your compiler version and how to patch it, if needed.
-
- - S60 Platform SDK 3rd Edition FP1 or higher:
- http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/
-
- - Open C/C++ v1.6.0 or higher. Install this to all S60 SDKs you plan to use Qt with:
- http://www.forum.nokia.com/main/resources/technologies/openc_cpp/
-
- - Building Qt tools requires a windows compiler, e.g. MinGW 3.4.5 or higher.
- http://www.mingw.org/
-
- - Building Qt libraries for real device requires RVCT 2.2 [build 686] or later:
- http://www.arm.com/products/DevTools/RVCT.html
-
- Make sure you have the following packages installed on any device you want to use to
- run Qt applications. These packages can be found under nokia_plugin directory in any
- S60 SDK where you have installed Open C/C++:
-
- - nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis
- - nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis
- - nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis
-
- These instructions assume the above tools are installed and
- that the enviroment variables for your compiler are set correctly.
-
- Note: Users of S60 Platform SDK 3rd Edition FP1 also need special updates:
- http://pepper.troll.no/s60prereleases/patches/
-
-2. Install Qt
-
- Uncompress the package into the directory you want Qt installed,
- e.g. C:\Qt\%VERSION%.
-
- Note: Qt must be installed on the same drive as the S60 SDK you are
- using, and the install path must not contain any whitespaces.
-
-3. Environment variables
-
- In order to build and use Qt, the PATH environment variable needs
- to be extended:
-
- PATH - to locate qmake, moc and other Qt tools
-
- This is done by adding c:\Qt\%VERSION%\bin to the PATH variable.
-
- On Windows the PATH can be extended by navigating to
- "Control Panel->System->Advanced->Environment variables".
-
- In addition, you must configure the environment for use with the S60
- emulator. This is done by locating the Carbide.c++ submenu on the Start
- menu, and choosing "Configure environment for WINSCW command line".
-
-4. Configure Qt
-
- To configure Qt for S60, do:
-
- cd \Qt\%VERSION%
- configure -platform win32-g++ -xplatform symbian-abld
-
- For other options, type "configure -help" to get a list of all available
- options.
-
-5. Build Qt
-
- To build Qt for the emulator, type:
-
- make debug-winscw
-
- To build Qt for the device, type:
-
- make release-armv5
-
- Congratulations, Qt is now ready to use.
-
-6. Running Qt demos
-
- We've included a subset of the Qt demos in this package for you to try out.
- An excellent starting point is the "fluidlauncher" demo. To run the demo on
- a real device, you first have to install the Qt libraries on the device:
-
- cd src\s60installs
- createpackage -i Qt_for_S60_template.pkg release-armv5 <certificate file> <certificate key file>
-
- Note: You will need to supply certificate that allows installation of
- binaries with "All -Tcb" capability to your device.
-
- Similarly, install fluidlauncher to the device:
-
- cd embedded\fluidlauncher
- createpackage -i fluidlauncher_template.pkg release-armv5
-
- This will create a self-signed fluidlauncher_release-armv5.sis and install it to your device.
-
- To run the demos on the emulator simply navigate to the directory of the demo and run:
-
- make run
-
- Or, if you need to supply arguments to the program, navigate to
- %EPOCROOT%\Epoc32\release\winscw\udeb\ and start any of the Qt demos located there,
- for example:
-
- wiggly.exe -small-screen
-
- We hope you will enjoy using Qt.
diff --git a/README.wince b/README.wince
deleted file mode 100644
index 27dfd60354..0000000000
--- a/README.wince
+++ /dev/null
@@ -1,44 +0,0 @@
- Signing on Windows CE.
-
-Windows CE provides a security mechanism to ask the user to confirm
-that he wants to use an application/library, which is unknown to the
-system. This process gets repeated for each dependency of an
-application, meaning each library the application links to, which is
-not recognized yet.
-
-To simplify this process you can use signatures and certificates. A
-certificate gets installed on the device and each file which is
-signed with the according certificate can be launched without the
-security warning.
-
-In case you want to use signatures for your project written in Qt,
-configure provides the -signature option. You need to specify the
-location of the .pfx file and qmake adds the signing step to the
-build rules.
-
-If you need to select a separate signature for a specific project,
-or you only want to sign this single project, you can use the
-"SIGNATURE_FILE = foo.pfx" rule inside the project file.
-
-The above decribed rules apply for command line makefiles as well as
-Visual Studio projects generated by qmake.
-
-Microsoft usually ships development signatures inside the SDK packages.
-You can find them in the Tools subdirectory of the SDK root folder.
-
-Example:
-
-1. calling configure with signing enabled:
-configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
--signature C:\some\path\SDKSamplePrivDeveloper.pfx
-
-2. using pro file to specify signature
-[inside .pro file]
-...
-TARGET = foo
-
-wince*: {
- SIGNATURE_FILE = somepath\customSignature.pfx
-}
-...
-
diff --git a/dist/README b/dist/README
index 05475e70a9..1c52eb31fb 100644
--- a/dist/README
+++ b/dist/README
@@ -19,17 +19,22 @@ On Mac OS X, the binary package requires Mac OS X 10.4.x (Tiger) or
later and GCC 4.0.1 to develop applications. Its applications will run
on Mac OS X 10.3.9 and above.
-If you have a source package (a .tar.gz, .tar.bz2, or .zip file),
-follow the instructions in the INSTALL file.
+If you have a source package (a .tar.gz, or .zip file), follow the
+instructions in the INSTALL file.
DEMOS AND EXAMPLES
Once Qt is installed, we suggest that you take a look at the demos and
-examples to see Qt in action. Run the Qt Examples and Demos either by
+examples to see Qt in action.
+
+For desktop computers, run the Qt Examples and Demos either by
typing 'qtdemo' on the command line or through the desktop's Start
menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
+For embedded devices, launch the Qt 'fluidlauncher' demo, either through
+the platforms filebrowser or the built in menu system.
+
REFERENCE DOCUMENTATION
@@ -43,7 +48,7 @@ documentation is available at http://qt.nokia.com/doc/.
SUPPORTED PLATFORMS
For a complete list of supported platforms, see
-http://qt.nokia.com/doc/latest/supported-platforms.html.
+http://qt.nokia.com/doc/%VERSION%/supported-platforms.html.
COMMERCIAL EDITIONS
@@ -56,16 +61,18 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
Qt3Support modules.
For a full listing of the contents of each module, please refer to
-http://qt.nokia.com/doc/latest/modules.html
+http://qt.nokia.com/doc/%VERSION%/modules.html
HOW TO REPORT A BUG
If you think you have found a bug in Qt, we would like to hear about
-it so that we can fix it. Before reporting a bug, please check
-http://qt.nokia.com/developer/faqs/ and
-http://qt.nokia.com/products/appdev/platform/platforms/ to see if
-the issue is already known.
+it so that we can fix it. The Qt bug tracking system is open to the
+public at http://bugreports.qt.nokia.com/.
+
+Before reporting a bug, please use the bug-tracker's search functions
+and consult http://qt.nokia.com/developer/faqs/ to see if the issue is
+already known.
Always include the following information in your bug report: the name
and version number of your compiler; the name and version number of
@@ -74,11 +81,9 @@ configure options it was compiled with.
If the problem you are reporting is only visible at run-time, try to
create a small test program that shows the problem when run. Often,
-such a program can be created with some minor changes to one of the
-many example programs in Qt's examples directory. Please submit the
-bug report using the Task Tracker on the Qt website:
-
-http://qt.nokia.com/developer/task-tracker
+such a program can be created with some minor changes to one of the many
+example programs in Qt's examples directory, or to the autotests that
+are available in the public source repository on http://qt.gitorious.org/.
Qt is a trademark of Nokia Corporation and/or its subsidiary(-ies).
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 1eefed3e59..c8e225c3bb 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -39,10 +39,6 @@
**
****************************************************************************/
-/****************************************************************************
-** Please remember to update the corresponding INSTALL files.
-****************************************************************************/
-
/*!
\group installation
\title Installation
@@ -484,6 +480,7 @@ in the \l{Qt for Windows CE Requirements} document.
\o \l{Windows CE - Introduction to using Qt}
\o \l{Windows CE - Working with Custom SDKs}
\o \l{Windows CE - Using shadow builds}
+ \o \l{Windows CE - Signing}
\endlist
Information on feature and performance tuning for embedded builds can
diff --git a/doc/src/platforms/wince-signing.qdoc b/doc/src/platforms/wince-signing.qdoc
new file mode 100644
index 0000000000..fa383b34ea
--- /dev/null
+++ b/doc/src/platforms/wince-signing.qdoc
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \page windowsce-signing.html
+ \ingroup qtce
+ \title Windows CE - Signing
+ \brief How to sign Qt projects for use with Windows CE.
+
+ \section1 Signing on Windows CE
+
+Windows CE provides a security mechanism to ask the user to confirm
+that they want to use an application/library that is unknown to the
+system. This process gets repeated for each dependency of an
+application, meaning each library the application links to, which is
+not recognized yet.
+
+To simplify this process you can use signatures and certificates. A
+certificate gets installed on the device and each file which is
+signed with the according certificate can be launched without the
+security warning.
+
+If you want to use signatures for your project written in Qt,
+configure provides the \c -signature option. You need to specify the
+location of the .pfx file and qmake adds the signing step to the
+build rules.
+
+If you need to select a separate signature for a specific project,
+or you only want to sign a single project, you can use the
+"SIGNATURE_FILE = foo.pfx" rule inside the project file.
+
+The above described rules apply for command line makefiles as well as
+Visual Studio projects generated by qmake.
+
+Microsoft usually ships development signatures inside the SDK packages.
+You can find them in the Tools subdirectory of the SDK root folder.
+
+Example:
+
+\list
+\o Calling configure with signing enabled:
+\code
+configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -signature C:\some\path\SDKSamplePrivDeveloper.pfx
+\endcode
+
+\o Using pro file to specify signature
+\code
+...
+TARGET = foo
+
+wince*: {
+ SIGNATURE_FILE = somepath\customSignature.pfx
+}
+...
+\endcode
+\endlist
+
+*/