summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-01-20 14:01:25 +0100
committerTim Jenssen <tim.jenssen@digia.com>2014-02-18 14:19:22 +0100
commit22795aa442f2cd702a9ce2686501e48f0a6ff423 (patch)
treea86a648d2ad30b5d106a83de516522b0b9cdc12e
parente04464602c14d20489fb2cbed259576655b99648 (diff)
add headless possibility
Change-Id: I05eb763f0b8d8c97ceccc7bb2db2086c04ffa92b Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r--src/libs/installer/init.cpp3
-rw-r--r--src/sdk/sdk.pro6
2 files changed, 9 insertions, 0 deletions
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index 12891f0e2..eedae80bd 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -188,6 +188,9 @@ static void messageHandler(QtMsgType type, const char *msg)
#else
void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
+ // suppress warning from QPA minimal plugin
+ if (msg.contains(QLatin1String("This plugin does not support propagateSizeHints")))
+ return;
QByteArray ba = trimAndPrepend(type, msg.toLocal8Bit());
if (type != QtDebugMsg) {
ba += QString(QStringLiteral(" (%1:%2, %3)")).arg(
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro
index 2f57994f0..132f26271 100644
--- a/src/sdk/sdk.pro
+++ b/src/sdk/sdk.pro
@@ -8,6 +8,12 @@ QT += network script xml
isEqual(QT_MAJOR_VERSION, 5) {
QT += widgets
+ # add the minimal plugin in static case to be able to start the installer
+ # headless with: installer-binary -platform minimal
+ # using QT += qpa_minimal_plugin would result in a minimal only compiled version
+ !win32:CONFIG(static, static|shared) {
+ QTPLUGIN += qminimal
+ }
}
DESTDIR = $$IFW_APP_PATH