summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp14
-rw-r--r--tools/configure/configureapp.h1
2 files changed, 3 insertions, 12 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index cff3f1bf0c..06f78b1116 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3398,10 +3398,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";
@@ -3574,8 +3572,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";
@@ -4475,11 +4472,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;