diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-08-02 17:11:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-03 16:12:35 +0200 |
| commit | 9743b43663f2dac99df0e1e5219b0d65bee2d7f2 (patch) | |
| tree | a41f3e18eaae73aac5cebc7150f7aed5662974e9 /src/plugins/welcome | |
| parent | 6c8edcf99ed0cd77a3667e61417a224461060ab7 (diff) | |
| download | qt-creator-9743b43663f2dac99df0e1e5219b0d65bee2d7f2.tar.gz | |
Make Components installable. Fix Shadow Build.
Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/welcome')
| -rw-r--r-- | src/plugins/welcome/welcomeplugin.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 85b40f286e..9be13f2b0b 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -53,6 +53,8 @@ #include <QtGui/QPainter> #include <QtGui/QHBoxLayout> +#include <QtCore/QCoreApplication> +#include <QtCore/QDir> #include <QtCore/QSettings> #include <QtCore/QDebug> #include <QtCore/QUrl> @@ -224,7 +226,13 @@ void WelcomeMode::initPlugins() if (!debug) engine->setOutputWarningsToStandardError(false); engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory); - engine->addImportPath(Core::ICore::instance()->resourcePath() + "/welcomescreen"); + QString pluginPath = QCoreApplication::applicationDirPath(); +#ifdef Q_OS_MAC + pluginPath += QLatin1String("/../PlugIns"); +#else + pluginPath += QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator"); +#endif + engine->addImportPath(QDir::cleanPath(pluginPath)); facilitateQml(engine); foreach (Utils::IWelcomePage *plugin, plugins) { plugin->facilitateQml(engine); |