summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-02-20 13:55:42 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2015-02-25 15:34:04 +0000
commitf0951246d8192c8fbd3ea7f6366f476736ae1a2d (patch)
tree385e44d3b75b349a13d0076a710075e70b65e5eb
parent683c2e80d4294e44820e244f87dc9250cdc59087 (diff)
Fix dependencies in static build
Change-Id: Iae06c6d5a9b1c678a4ab136da145a9c69ccadb6e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
-rw-r--r--INSTALL2
-rw-r--r--doc/installerfw-getting-started.qdoc2
-rw-r--r--src/sdk/sdk.pro7
3 files changed, 9 insertions, 2 deletions
diff --git a/INSTALL b/INSTALL
index f2e3ff06f..4f7e39636 100644
--- a/INSTALL
+++ b/INSTALL
@@ -61,7 +61,7 @@ configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-ope
Recommended configuration options for Linux:
-configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
+configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
### OS X
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index fdce93a46..55d5ccfc4 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -94,7 +94,7 @@
We recommend that you use the following configuration options for Linux:
\code
- configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
+ configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
\endcode
\section3 Configuring Qt for OS X
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro
index 3919f2877..d228593da 100644
--- a/src/sdk/sdk.pro
+++ b/src/sdk/sdk.pro
@@ -12,6 +12,13 @@ QT += network qml xml widgets
QTPLUGIN += qminimal
}
+CONFIG(static, static|shared) {
+ # prevent qmake from automatically linking in imageformats, bearer, qmltooling plugins
+ QTPLUGIN.imageformats = -
+ QTPLUGIN.bearer = -
+ QTPLUGIN.qmltooling = -
+}
+
DESTDIR = $$IFW_APP_PATH
exists($$LRELEASE) {