diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-16 19:35:17 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-18 07:44:57 +0200 |
commit | dcfd36c2686bcbd56b6a0295640e228f76d7bf1d (patch) | |
tree | c4de810417b751431771bd2d15d49a63167ab0f0 /tools | |
parent | d449c0e0e4e39606e0421090b9356c46bc29030c (diff) |
Revert "Automatically link printsupport plugins to static applications."
It has been fully obsoleted by 4255ba40ab073afcf2a095b135883612859af4c2.
This reverts commit 99eecab83d4a4c79979aa0b1fcf1f58c14dcf526.
Change-Id: Id7b8d3bba27ff43e38e4fe32a4f2950de9ced493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 14 | ||||
-rw-r--r-- | tools/configure/configureapp.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d149511218..fe2caa2efa 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3372,10 +3372,8 @@ void Configure::generateQConfigPri() if (!dictionary["QT_NAMESPACE"].isEmpty()) configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; - if (dictionary[ "SHARED" ] == "no") { - configStream << "QT_DEFAULT_QPA_PLUGIN = q" << qpaPlatformName() << endl - << "QT_DEFAULT_PRINTSUPPORTPLUGIN = " << qpaPrintSupportPluginName() << endl; - } + if (dictionary[ "SHARED" ] == "no") + configStream << "QT_DEFAULT_QPA_PLUGIN = q" << qpaPlatformName() << endl; if (!configStream.flush()) dictionary[ "DONE" ] = "error"; @@ -3548,8 +3546,7 @@ void Configure::generateConfigfiles() for (int i = 0; i < qconfigList.count(); ++i) tmpStream << addDefine(qconfigList.at(i)); - tmpStream << "#define QT_QPA_DEFAULT_PLATFORM_NAME \"" << qpaPlatformName() << "\"" << endl - << "#define QT_QPA_DEFAULT_PRINTSUPPORTPLUGIN_NAME \"" << qpaPrintSupportPluginName() << "\"" << endl; + tmpStream<<"#define QT_QPA_DEFAULT_PLATFORM_NAME \"" << qpaPlatformName() << "\""<<endl; if (!tmpStream.flush()) dictionary[ "DONE" ] = "error"; @@ -4449,11 +4446,6 @@ QString Configure::qpaPlatformName() const } } -QString Configure::qpaPrintSupportPluginName() const -{ - return platform() == WINDOWS ? QStringLiteral("windowsprintersupport") : QString(); -} - int Configure::platform() const { const QString qMakeSpec = dictionary.value("QMAKESPEC"); diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index e8de10dcf7..98e4912eaa 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -100,7 +100,6 @@ public: int platform() const; QString platformName() const; QString qpaPlatformName() const; - QString qpaPrintSupportPluginName() const; private: bool checkAngleAvailability(QString *errorMessage = 0) const; |