diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2014-07-28 14:36:03 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2014-08-07 17:04:41 +0200 |
| commit | 8fd31969d30698172d7403686953860c0f3468a8 (patch) | |
| tree | b5a49418a8f488daddebab515824a653fbe573c1 | |
| parent | f26b2836d0271e53f30b94d9a854477309f65a02 (diff) | |
Change DuSE-MT's plugin controller to correctly load plugins in MacOS
Thanks to Michel Liberado <michel.liberado@gmail.com>
Change-Id: If5abd5064083777ab54fcdba4af8b3c64393301a
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
| -rw-r--r-- | examples/uml/duse-mt/src/app/shell/plugincontroller.cpp | 14 | ||||
| -rw-r--r-- | sync.profile | 6 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 1 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 6 |
5 files changed, 35 insertions, 4 deletions
diff --git a/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp b/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp index e67141cf..36c2a7c8 100644 --- a/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp +++ b/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp @@ -88,7 +88,19 @@ bool PluginController::initialize() // Load DuSE-MT plugins QDir dusePluginsDir(QCoreApplication::applicationDirPath()); - dusePluginsDir.cd("../lib/duse-mt/plugins"); + +#if defined(Q_OS_MAC) + if (dusePluginsDir.dirName() == "MacOS") + { + dusePluginsDir.cdUp(); + dusePluginsDir.cdUp(); + dusePluginsDir.cdUp(); + } +#endif + + dusePluginsDir.cdUp(); + dusePluginsDir.cd("lib/duse-mt/plugins"); + QHash<QString, QString> invertedDependency; QObjectList pluginList; foreach (const QFileInfo &subdir, dusePluginsDir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot)) { diff --git a/sync.profile b/sync.profile index 0172cd74..d32194b6 100644 --- a/sync.profile +++ b/sync.profile @@ -40,7 +40,7 @@ ); %dependencies = ( - "qtbase" => "refs/heads/dev", - "qtscript" => "refs/heads/dev", - "qtdeclarative" => "refs/heads/dev", + "qtbase" => "refs/heads/5.3", + "qtscript" => "refs/heads/5.3", + "qtdeclarative" => "refs/heads/5.3", ); diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2fa25521..e32f4491 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,5 +1,6 @@ TEMPLATE=subdirs SUBDIRS = \ + cmake \ qtmofcontainment \ qtumlcontainment \ qtumlprovidedrequiredinterfaces \ diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 00000000..3d77b9e5 --- /dev/null +++ b/tests/auto/cmake/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +find_package(Qt5Core REQUIRED) + +include("${_Qt5CTestMacros}") + +test_module_includes( +) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro new file mode 100644 index 00000000..ac6b85f0 --- /dev/null +++ b/tests/auto/cmake/cmake.pro @@ -0,0 +1,6 @@ +# Cause make to do nothing. +TEMPLATE = subdirs + +CMAKE_QT_MODULES_UNDER_TEST = qtmodeling + +CONFIG += ctest_testcase |