summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-11-13 16:24:21 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2012-11-14 11:48:53 +0100
commita909c667491e2693dbbfc98b241f50ef5082b1bf (patch)
treea591603a2e968047f2acb6fea75ab884ed87c19c
parent274c93b4a05967563f0b201ff0b6faf9b6292701 (diff)
Remove recommended -no-svg switch for Windows
configure.exe doesn't know about -no-svg (Qt 4.8.3). Also, remove -no-declarative-debug: It has no effect since -no-declarative is already set. Change-Id: Ib6733acf0cf1b10b70faaf2e2c09f323fde8e312 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r--README2
-rw-r--r--doc/installerfw-getting-started.qdoc2
2 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 9248271d0..0f161a8f4 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ To build an installer, it is advised to use a statically linked Qt.
QMAKE_CFLAGS_LTCG = -GL
Recommended configure options for windows:
-configure.exe -platform win32-msvc20XX -release -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -no-multimedia -no-declarative -no-declarative-debug -nomake examples -nomake demos -qt-sql-sqlite -plugin-sql-sqlite -opensource
+configure.exe -platform win32-msvc20XX -release -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-multimedia -no-declarative -nomake examples -nomake demos -qt-sql-sqlite -plugin-sql-sqlite -opensource
Recommended configure options for Linux:
configure -nomake examples -nomake demos -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -developer-build -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -release
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index ecdc10af4..70ccbb164 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -78,7 +78,7 @@
Windows:
\code
- configure.exe -platform win32-msvc20XX -release -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -no-multimedia -no-declarative -no-declarative-debug -nomake examples -nomake demos -qt-sql-sqlite -plugin-sql-sqlite -opensource
+ configure.exe -platform win32-msvc20XX -release -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-multimedia -no-declarative -nomake examples -nomake demos -qt-sql-sqlite -plugin-sql-sqlite -opensource
\endcode
\section2 Configuring Qt for Linux and Mac OS X