summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libs/installer/macrelocateqt.cpp6
-rw-r--r--src/libs/installer/macreplaceinstallnamesoperation.cpp35
-rw-r--r--src/libs/installer/macreplaceinstallnamesoperation.h2
-rw-r--r--src/libs/installer/resources/files-to-patch-linux148
-rw-r--r--src/libs/installer/resources/files-to-patch-macx148
-rw-r--r--src/libs/installer/resources/files-to-patch-windows156
-rw-r--r--src/sdk/installerbasecommons.cpp2
7 files changed, 482 insertions, 15 deletions
diff --git a/src/libs/installer/macrelocateqt.cpp b/src/libs/installer/macrelocateqt.cpp
index 98f8153c5..b499635e0 100644
--- a/src/libs/installer/macrelocateqt.cpp
+++ b/src/libs/installer/macrelocateqt.cpp
@@ -78,13 +78,11 @@ bool Relocator::apply(const QString &qtInstallDir, const QString &targetDir)
MacReplaceInstallNamesOperation operation;
+ operation.setComponentRootPath(qtInstallDir);
QStringList arguments;
arguments << indicator
<< replacement
- << qtInstallDir + QLatin1String("/plugins")
- << qtInstallDir + QLatin1String("/lib")
- << qtInstallDir + QLatin1String("/imports")
- << qtInstallDir + QLatin1String("/bin");
+ << qtInstallDir;
operation.setArguments(arguments);
operation.performOperation();
diff --git a/src/libs/installer/macreplaceinstallnamesoperation.cpp b/src/libs/installer/macreplaceinstallnamesoperation.cpp
index 06ef9f6a0..435df8eee 100644
--- a/src/libs/installer/macreplaceinstallnamesoperation.cpp
+++ b/src/libs/installer/macreplaceinstallnamesoperation.cpp
@@ -42,6 +42,10 @@
using namespace QInstaller;
MacReplaceInstallNamesOperation::MacReplaceInstallNamesOperation()
+ : m_indicator(),
+ m_installationDir(),
+ m_componentRootPath()
+
{
setName(QLatin1String("ReplaceInstallNames"));
}
@@ -134,6 +138,11 @@ bool MacReplaceInstallNamesOperation::apply(const QString &indicator, const QStr
return error() == NoError;
}
+void MacReplaceInstallNamesOperation::setComponentRootPath(const QString &path)
+{
+ m_componentRootPath = path;
+}
+
void MacReplaceInstallNamesOperation::extractExecutableInfo(const QString &fileName, QString &frameworkId,
QStringList &frameworks, QString &originalBuildDir)
{
@@ -205,23 +214,35 @@ void MacReplaceInstallNamesOperation::relocateBinary(const QString &fileName)
qDebug() << QString::fromLatin1("Got the following information(fileName: %1, frameworkId: %2, frameworks: %3,"
"orginalBuildDir: %4)").arg(fileName, frameworkId, frameworks.join(QLatin1String("|")), originalBuildDir);
+ // Use regexp to find matches from frameworks and static libs
+ QRegExp frameworkRegexp(QLatin1String("Qt[3a-zA-Z]*\\.framework/"));
+ QRegExp dylibRegexp(QLatin1String("libQt.*\\.dylib"));
QStringList args;
- if (frameworkId.contains(m_indicator) || QFileInfo(frameworkId).fileName() == frameworkId) {
+ // change framework ID only if Qt library reference
+ if (frameworkId.indexOf(frameworkRegexp) >= 0) {
args << QLatin1String("-id") << fileName << fileName;
if (!execCommand(QLatin1String("install_name_tool"), args))
return;
}
+ // calculate path prefix which is the full installation path and
+ // /lib/ added so that it points to Qt installations libraries
+ QString prefix = m_componentRootPath + QLatin1String("/lib/");
+ // calculate path prefix which is the full installation path and
+ // /lib/ added so that it points to Qt installations libraries
foreach (const QString &fw, frameworks) {
- if (originalBuildDir.isEmpty() && fw.contains(m_indicator)) {
- originalBuildDir = fw.left(fw.indexOf(m_indicator));
- }
- if (originalBuildDir.isEmpty() || !fw.contains(originalBuildDir))
+ int fraIndex = fw.indexOf(frameworkRegexp);
+ int dyIndex = fw.indexOf(dylibRegexp);
+ QString newPath;
+ if (fraIndex >= 0)
+ newPath = fw.mid(fraIndex);
+ else if (dyIndex >= 0)
+ newPath = fw.mid(dyIndex);
+ else
continue;
- QString newPath = fw;
- newPath.replace(originalBuildDir, m_installationDir);
+ newPath = prefix + newPath;
args.clear();
args << QLatin1String("-change") << fw << newPath << fileName;
if (!execCommand(QLatin1String("install_name_tool"), args))
diff --git a/src/libs/installer/macreplaceinstallnamesoperation.h b/src/libs/installer/macreplaceinstallnamesoperation.h
index 29f226de6..cad556394 100644
--- a/src/libs/installer/macreplaceinstallnamesoperation.h
+++ b/src/libs/installer/macreplaceinstallnamesoperation.h
@@ -49,6 +49,7 @@ public:
Operation *clone() const;
bool apply(const QString &oldString, const QString &newString, const QString &frameworkDir);
+ void setComponentRootPath(const QString &path);
private:
void extractExecutableInfo(const QString &fileName, QString &frameworkId, QStringList &frameworks,
@@ -60,6 +61,7 @@ private:
private:
QString m_indicator;
QString m_installationDir;
+ QString m_componentRootPath;
};
} // namespace QInstaller
diff --git a/src/libs/installer/resources/files-to-patch-linux b/src/libs/installer/resources/files-to-patch-linux
index 9c7b39f4a..f8da5cef5 100644
--- a/src/libs/installer/resources/files-to-patch-linux
+++ b/src/libs/installer/resources/files-to-patch-linux
@@ -70,3 +70,151 @@ lib/pkgconfig/QtWebKit.pc
lib/pkgconfig/QtXmlPatterns.pc
lib/pkgconfig/QtXml.pc
mkspecs/qconfig.pri
+
+lib/libQtContacts.prl
+lib/libQtQuick.prl
+lib/libQtTest.prl
+lib/libQtPrintSupport.prl
+lib/libQtCore.prl
+lib/libQtMultimedia.prl
+lib/libQtServiceFramework.prl
+lib/libQtDBus.prl
+lib/libQtPlatformSupport.prl
+lib/libQtDesignerComponents.prl
+lib/libQtUiTools.prl
+lib/libQtQmlDevTools.prl
+lib/libQt3DQuick.prl
+lib/libQtMultimediaWidgets.prl
+lib/libQtQml.prl
+lib/libQtJsonDb.prl
+lib/libQtBluetooth.prl
+lib/libQtV8.prl
+lib/libQtQuick1.prl
+lib/libQt3D.prl
+lib/libQtQuickParticles.prl
+lib/libQtSensors.prl
+lib/libQtFeedback.prl
+lib/libQtSql.prl
+lib/libQtSvg.prl
+lib/libQtNetwork.prl
+lib/libQtJsonDbCompat.prl
+lib/libQtLocation.prl
+lib/libQtXmlPatterns.prl
+lib/libQtConcurrent.prl
+lib/libQtVersit.prl
+lib/libQtHelp.prl
+lib/libQtXml.prl
+lib/libQtVersitOrganizer.prl
+lib/libQtOrganizer.prl
+lib/libQtOpenGL.prl
+lib/libQtSystemInfo.prl
+lib/libQtScriptTools.prl
+lib/libQtAddOnGallery.prl
+lib/libQtPublishSubscribe.prl
+lib/libQtMultimediaQuick_p.prl
+lib/libQtQuickTest.prl
+lib/libQtScript.prl
+lib/libQtJsonDbPartition.prl
+lib/libphonon.prl
+lib/libQtGui.prl
+lib/libQtWidgets.prl
+lib/libQtDesigner.prl
+lib/libQtCLucene.prl
+
+lib/pkgconfig/QtVersitOrganizer.pc
+lib/pkgconfig/QtDesignerComponents.pc
+lib/pkgconfig/QtGui.pc
+lib/pkgconfig/QtPlatformSupport.pc
+lib/pkgconfig/QtSystemInfo.pc
+lib/pkgconfig/QtQuickTest.pc
+lib/pkgconfig/QtSvg.pc
+lib/pkgconfig/QtContacts.pc
+lib/pkgconfig/QtDesigner.pc
+lib/pkgconfig/QtConcurrent.pc
+lib/pkgconfig/QtXmlPatterns.pc
+lib/pkgconfig/Qt3D.pc
+lib/pkgconfig/QtV8.pc
+lib/pkgconfig/QtScript.pc
+lib/pkgconfig/Qt3DQuick.pc
+lib/pkgconfig/QtQuick1.pc
+lib/pkgconfig/QtFeedback.pc
+lib/pkgconfig/QtNetwork.pc
+lib/pkgconfig/QtAddOnGallery.pc
+lib/pkgconfig/QtMultimediaWidgets.pc
+lib/pkgconfig/QtSql.pc
+lib/pkgconfig/QtQuick.pc
+lib/pkgconfig/QtQuickParticles.pc
+lib/pkgconfig/QtQmlDevTools.pc
+lib/pkgconfig/QtQml.pc
+lib/pkgconfig/QtBluetooth.pc
+lib/pkgconfig/QtHelp.pc
+lib/pkgconfig/QtMultimedia.pc
+lib/pkgconfig/QtScriptTools.pc
+lib/pkgconfig/QtOrganizer.pc
+lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtJsonDb.pc
+lib/pkgconfig/QtCore.pc
+lib/pkgconfig/QtServiceFramework.pc
+lib/pkgconfig/QtCLucene.pc
+lib/pkgconfig/QtJsonDbCompat.pc
+lib/pkgconfig/QtDBus.pc
+lib/pkgconfig/QtUiTools.pc
+lib/pkgconfig/QtSensors.pc
+lib/pkgconfig/QtLocation.pc
+lib/pkgconfig/QtXml.pc
+lib/pkgconfig/QtOpenGL.pc
+lib/pkgconfig/QtVersit.pc
+lib/pkgconfig/QtPrintSupport.pc
+lib/pkgconfig/QtJsonDbPartition.pc
+lib/pkgconfig/QtPublishSubscribe.pc
+lib/pkgconfig/QtWidgets.pc
+lib/pkgconfig/phonon.pc
+
+lib/libQtFeedback.la
+lib/libQtXmlPatterns.la
+lib/libQtPublishSubscribe.la
+lib/libphonon.la
+lib/libQtMultimedia.la
+lib/libQtSystemInfo.la
+lib/libQtOrganizer.la
+lib/libQtMultimediaWidgets.la
+lib/libQtQuick1.la
+lib/libQtVersit.la
+lib/libQtDesignerComponents.la
+lib/libQtBluetooth.la
+lib/libQtQuick.la
+lib/libQtServiceFramework.la
+lib/libQtQml.la
+lib/libQtWidgets.la
+lib/libQtSql.la
+lib/libQtContacts.la
+lib/libQtPlatformSupport.la
+lib/libQtGui.la
+lib/libQtScriptTools.la
+lib/libQtV8.la
+lib/libQtLocation.la
+lib/libQtConcurrent.la
+lib/libQt3DQuick.la
+lib/libQtJsonDb.la
+lib/libQtXml.la
+lib/libQt3D.la
+lib/libQtJsonDbPartition.la
+lib/libQtOpenGL.la
+lib/libQtNetwork.la
+lib/libQtUiTools.la
+lib/libQtVersitOrganizer.la
+lib/libQtAddOnGallery.la
+lib/libQtHelp.la
+lib/libQtDesigner.la
+lib/libQtJsonDbCompat.la
+lib/libQtCore.la
+lib/libQtSensors.la
+lib/libQtTest.la
+lib/libQtSvg.la
+lib/libQtQmlDevTools.la
+lib/libQtPrintSupport.la
+lib/libQtQuickParticles.la
+lib/libQtScript.la
+lib/libQtCLucene.la
+lib/libQtQuickTest.la
+lib/libQtDBus.la
diff --git a/src/libs/installer/resources/files-to-patch-macx b/src/libs/installer/resources/files-to-patch-macx
index 7f8deda14..9a8e30f66 100644
--- a/src/libs/installer/resources/files-to-patch-macx
+++ b/src/libs/installer/resources/files-to-patch-macx
@@ -59,3 +59,151 @@ lib/pkgconfig/QtWebKit.pc
lib/pkgconfig/QtXmlPatterns.pc
lib/pkgconfig/QtXml.pc
mkspecs/qconfig.pri
+
+lib/libQtContacts.prl
+lib/libQtQuick.prl
+lib/libQtTest.prl
+lib/libQtPrintSupport.prl
+lib/libQtCore.prl
+lib/libQtMultimedia.prl
+lib/libQtServiceFramework.prl
+lib/libQtDBus.prl
+lib/libQtPlatformSupport.prl
+lib/libQtDesignerComponents.prl
+lib/libQtUiTools.prl
+lib/libQtQmlDevTools.prl
+lib/libQt3DQuick.prl
+lib/libQtMultimediaWidgets.prl
+lib/libQtQml.prl
+lib/libQtJsonDb.prl
+lib/libQtBluetooth.prl
+lib/libQtV8.prl
+lib/libQtQuick1.prl
+lib/libQt3D.prl
+lib/libQtQuickParticles.prl
+lib/libQtSensors.prl
+lib/libQtFeedback.prl
+lib/libQtSql.prl
+lib/libQtSvg.prl
+lib/libQtNetwork.prl
+lib/libQtJsonDbCompat.prl
+lib/libQtLocation.prl
+lib/libQtXmlPatterns.prl
+lib/libQtConcurrent.prl
+lib/libQtVersit.prl
+lib/libQtHelp.prl
+lib/libQtXml.prl
+lib/libQtVersitOrganizer.prl
+lib/libQtOrganizer.prl
+lib/libQtOpenGL.prl
+lib/libQtSystemInfo.prl
+lib/libQtScriptTools.prl
+lib/libQtAddOnGallery.prl
+lib/libQtPublishSubscribe.prl
+lib/libQtMultimediaQuick_p.prl
+lib/libQtQuickTest.prl
+lib/libQtScript.prl
+lib/libQtJsonDbPartition.prl
+lib/libphonon.prl
+lib/libQtGui.prl
+lib/libQtWidgets.prl
+lib/libQtDesigner.prl
+lib/libQtCLucene.prl
+
+lib/pkgconfig/QtVersitOrganizer.pc
+lib/pkgconfig/QtDesignerComponents.pc
+lib/pkgconfig/QtGui.pc
+lib/pkgconfig/QtPlatformSupport.pc
+lib/pkgconfig/QtSystemInfo.pc
+lib/pkgconfig/QtQuickTest.pc
+lib/pkgconfig/QtSvg.pc
+lib/pkgconfig/QtContacts.pc
+lib/pkgconfig/QtDesigner.pc
+lib/pkgconfig/QtConcurrent.pc
+lib/pkgconfig/QtXmlPatterns.pc
+lib/pkgconfig/Qt3D.pc
+lib/pkgconfig/QtV8.pc
+lib/pkgconfig/QtScript.pc
+lib/pkgconfig/Qt3DQuick.pc
+lib/pkgconfig/QtQuick1.pc
+lib/pkgconfig/QtFeedback.pc
+lib/pkgconfig/QtNetwork.pc
+lib/pkgconfig/QtAddOnGallery.pc
+lib/pkgconfig/QtMultimediaWidgets.pc
+lib/pkgconfig/QtSql.pc
+lib/pkgconfig/QtQuick.pc
+lib/pkgconfig/QtQuickParticles.pc
+lib/pkgconfig/QtQmlDevTools.pc
+lib/pkgconfig/QtQml.pc
+lib/pkgconfig/QtBluetooth.pc
+lib/pkgconfig/QtHelp.pc
+lib/pkgconfig/QtMultimedia.pc
+lib/pkgconfig/QtScriptTools.pc
+lib/pkgconfig/QtOrganizer.pc
+lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtJsonDb.pc
+lib/pkgconfig/QtCore.pc
+lib/pkgconfig/QtServiceFramework.pc
+lib/pkgconfig/QtCLucene.pc
+lib/pkgconfig/QtJsonDbCompat.pc
+lib/pkgconfig/QtDBus.pc
+lib/pkgconfig/QtUiTools.pc
+lib/pkgconfig/QtSensors.pc
+lib/pkgconfig/QtLocation.pc
+lib/pkgconfig/QtXml.pc
+lib/pkgconfig/QtOpenGL.pc
+lib/pkgconfig/QtVersit.pc
+lib/pkgconfig/QtPrintSupport.pc
+lib/pkgconfig/QtJsonDbPartition.pc
+lib/pkgconfig/QtPublishSubscribe.pc
+lib/pkgconfig/QtWidgets.pc
+lib/pkgconfig/phonon.pc
+
+lib/libQtFeedback.la
+lib/libQtXmlPatterns.la
+lib/libQtPublishSubscribe.la
+lib/libphonon.la
+lib/libQtMultimedia.la
+lib/libQtSystemInfo.la
+lib/libQtOrganizer.la
+lib/libQtMultimediaWidgets.la
+lib/libQtQuick1.la
+lib/libQtVersit.la
+lib/libQtDesignerComponents.la
+lib/libQtBluetooth.la
+lib/libQtQuick.la
+lib/libQtServiceFramework.la
+lib/libQtQml.la
+lib/libQtWidgets.la
+lib/libQtSql.la
+lib/libQtContacts.la
+lib/libQtPlatformSupport.la
+lib/libQtGui.la
+lib/libQtScriptTools.la
+lib/libQtV8.la
+lib/libQtLocation.la
+lib/libQtConcurrent.la
+lib/libQt3DQuick.la
+lib/libQtJsonDb.la
+lib/libQtXml.la
+lib/libQt3D.la
+lib/libQtJsonDbPartition.la
+lib/libQtOpenGL.la
+lib/libQtNetwork.la
+lib/libQtUiTools.la
+lib/libQtVersitOrganizer.la
+lib/libQtAddOnGallery.la
+lib/libQtHelp.la
+lib/libQtDesigner.la
+lib/libQtJsonDbCompat.la
+lib/libQtCore.la
+lib/libQtSensors.la
+lib/libQtTest.la
+lib/libQtSvg.la
+lib/libQtQmlDevTools.la
+lib/libQtPrintSupport.la
+lib/libQtQuickParticles.la
+lib/libQtScript.la
+lib/libQtCLucene.la
+lib/libQtQuickTest.la
+lib/libQtDBus.la
diff --git a/src/libs/installer/resources/files-to-patch-windows b/src/libs/installer/resources/files-to-patch-windows
index 845a299ce..efb90d53a 100644
--- a/src/libs/installer/resources/files-to-patch-windows
+++ b/src/libs/installer/resources/files-to-patch-windows
@@ -1,9 +1,9 @@
bin/qmake.exe
bin/lrelease.exe
-bin/QtCore4.dll
-bin/QtCored4.dll
-lib/QtCore4.dll
-lib/QtCored4.dll
+bin/QtCore5.dll
+bin/QtCored5.dll
+lib/QtCore5.dll
+lib/QtCored5.dll
%%
mkspecs/default/qmake.conf
demos/shared/libdemo_shared.prl
@@ -58,3 +58,151 @@ lib/QAxContainerd.prl
lib/QAxServer.prl
lib/QAxServerd.prl
.qmake.cache
+
+lib/libQtContacts.prl
+lib/libQtQuick.prl
+lib/libQtTest.prl
+lib/libQtPrintSupport.prl
+lib/libQtCore.prl
+lib/libQtMultimedia.prl
+lib/libQtServiceFramework.prl
+lib/libQtDBus.prl
+lib/libQtPlatformSupport.prl
+lib/libQtDesignerComponents.prl
+lib/libQtUiTools.prl
+lib/libQtQmlDevTools.prl
+lib/libQt3DQuick.prl
+lib/libQtMultimediaWidgets.prl
+lib/libQtQml.prl
+lib/libQtJsonDb.prl
+lib/libQtBluetooth.prl
+lib/libQtV8.prl
+lib/libQtQuick1.prl
+lib/libQt3D.prl
+lib/libQtQuickParticles.prl
+lib/libQtSensors.prl
+lib/libQtFeedback.prl
+lib/libQtSql.prl
+lib/libQtSvg.prl
+lib/libQtNetwork.prl
+lib/libQtJsonDbCompat.prl
+lib/libQtLocation.prl
+lib/libQtXmlPatterns.prl
+lib/libQtConcurrent.prl
+lib/libQtVersit.prl
+lib/libQtHelp.prl
+lib/libQtXml.prl
+lib/libQtVersitOrganizer.prl
+lib/libQtOrganizer.prl
+lib/libQtOpenGL.prl
+lib/libQtSystemInfo.prl
+lib/libQtScriptTools.prl
+lib/libQtAddOnGallery.prl
+lib/libQtPublishSubscribe.prl
+lib/libQtMultimediaQuick_p.prl
+lib/libQtQuickTest.prl
+lib/libQtScript.prl
+lib/libQtJsonDbPartition.prl
+lib/libphonon.prl
+lib/libQtGui.prl
+lib/libQtWidgets.prl
+lib/libQtDesigner.prl
+lib/libQtCLucene.prl
+
+lib/pkgconfig/QtVersitOrganizer.pc
+lib/pkgconfig/QtDesignerComponents.pc
+lib/pkgconfig/QtGui.pc
+lib/pkgconfig/QtPlatformSupport.pc
+lib/pkgconfig/QtSystemInfo.pc
+lib/pkgconfig/QtQuickTest.pc
+lib/pkgconfig/QtSvg.pc
+lib/pkgconfig/QtContacts.pc
+lib/pkgconfig/QtDesigner.pc
+lib/pkgconfig/QtConcurrent.pc
+lib/pkgconfig/QtXmlPatterns.pc
+lib/pkgconfig/Qt3D.pc
+lib/pkgconfig/QtV8.pc
+lib/pkgconfig/QtScript.pc
+lib/pkgconfig/Qt3DQuick.pc
+lib/pkgconfig/QtQuick1.pc
+lib/pkgconfig/QtFeedback.pc
+lib/pkgconfig/QtNetwork.pc
+lib/pkgconfig/QtAddOnGallery.pc
+lib/pkgconfig/QtMultimediaWidgets.pc
+lib/pkgconfig/QtSql.pc
+lib/pkgconfig/QtQuick.pc
+lib/pkgconfig/QtQuickParticles.pc
+lib/pkgconfig/QtQmlDevTools.pc
+lib/pkgconfig/QtQml.pc
+lib/pkgconfig/QtBluetooth.pc
+lib/pkgconfig/QtHelp.pc
+lib/pkgconfig/QtMultimedia.pc
+lib/pkgconfig/QtScriptTools.pc
+lib/pkgconfig/QtOrganizer.pc
+lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtJsonDb.pc
+lib/pkgconfig/QtCore.pc
+lib/pkgconfig/QtServiceFramework.pc
+lib/pkgconfig/QtCLucene.pc
+lib/pkgconfig/QtJsonDbCompat.pc
+lib/pkgconfig/QtDBus.pc
+lib/pkgconfig/QtUiTools.pc
+lib/pkgconfig/QtSensors.pc
+lib/pkgconfig/QtLocation.pc
+lib/pkgconfig/QtXml.pc
+lib/pkgconfig/QtOpenGL.pc
+lib/pkgconfig/QtVersit.pc
+lib/pkgconfig/QtPrintSupport.pc
+lib/pkgconfig/QtJsonDbPartition.pc
+lib/pkgconfig/QtPublishSubscribe.pc
+lib/pkgconfig/QtWidgets.pc
+lib/pkgconfig/phonon.pc
+
+lib/libQtFeedback.la
+lib/libQtXmlPatterns.la
+lib/libQtPublishSubscribe.la
+lib/libphonon.la
+lib/libQtMultimedia.la
+lib/libQtSystemInfo.la
+lib/libQtOrganizer.la
+lib/libQtMultimediaWidgets.la
+lib/libQtQuick1.la
+lib/libQtVersit.la
+lib/libQtDesignerComponents.la
+lib/libQtBluetooth.la
+lib/libQtQuick.la
+lib/libQtServiceFramework.la
+lib/libQtQml.la
+lib/libQtWidgets.la
+lib/libQtSql.la
+lib/libQtContacts.la
+lib/libQtPlatformSupport.la
+lib/libQtGui.la
+lib/libQtScriptTools.la
+lib/libQtV8.la
+lib/libQtLocation.la
+lib/libQtConcurrent.la
+lib/libQt3DQuick.la
+lib/libQtJsonDb.la
+lib/libQtXml.la
+lib/libQt3D.la
+lib/libQtJsonDbPartition.la
+lib/libQtOpenGL.la
+lib/libQtNetwork.la
+lib/libQtUiTools.la
+lib/libQtVersitOrganizer.la
+lib/libQtAddOnGallery.la
+lib/libQtHelp.la
+lib/libQtDesigner.la
+lib/libQtJsonDbCompat.la
+lib/libQtCore.la
+lib/libQtSensors.la
+lib/libQtTest.la
+lib/libQtSvg.la
+lib/libQtQmlDevTools.la
+lib/libQtPrintSupport.la
+lib/libQtQuickParticles.la
+lib/libQtScript.la
+lib/libQtCLucene.la
+lib/libQtQuickTest.la
+lib/libQtDBus.la
diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index 2f6e04a30..501a8a4a5 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -60,11 +60,13 @@ IntroductionPageImpl::IntroductionPageImpl(QInstaller::PackageManagerCore *core)
QVBoxLayout *layout = new QVBoxLayout(widget);
m_packageManager = new QRadioButton(tr("Package manager"), this);
+ m_packageManager->setEnabled(false); // ### Todo: Remove for online installers after Beta
layout->addWidget(m_packageManager);
m_packageManager->setChecked(core->isPackageManager());
connect(m_packageManager, SIGNAL(toggled(bool)), this, SLOT(setPackageManager(bool)));
m_updateComponents = new QRadioButton(tr("Update components"), this);
+ m_updateComponents->setEnabled(false); // ### Todo: Remove for online installers after Beta
layout->addWidget(m_updateComponents);
m_updateComponents->setChecked(core->isUpdater());
connect(m_updateComponents, SIGNAL(toggled(bool)), this, SLOT(setUpdater(bool)));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 02:00:02 +0000