Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Ported Ubuntu Components to Mac OSX and Qt 5.0.2
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp 2013-05-21 11:06:55 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp 2013-06-03 21:51:32 +0000
@@ -18,7 +18,7 @@
#include <QtQml>
#include <QtQuick/private/qquickimagebase_p.h>
-#include <QDBusConnection>
+//#include <QDBusConnection>
#include <QtGui/QGuiApplication>
#include <QtGui/QScreen>
@@ -33,12 +33,12 @@
#include "ucscalingimageprovider.h"
#include "ucqquickimageextension.h"
#include "quickutils.h"
-#include "giconprovider.h"
+//#include "giconprovider.h"
#include "shapeitem.h"
#include "inversemouseareatype.h"
#include "qquickclipboard.h"
#include "qquickmimedata.h"
-#include "bottombarvisibilitycommunicator.h"
+//#include "bottombarvisibilitycommunicator.h"
#include "ucstyle.h"
#include "ucubuntuanimation.h"
#include "ucfontutils.h"
@@ -108,12 +108,12 @@
QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()),
&fontUtilsListener, SLOT(updateContextProperty()));
- context->setContextProperty("bottomBarVisibilityCommunicator", &BottomBarVisibilityCommunicator::instance());
+ //context->setContextProperty("bottomBarVisibilityCommunicator", &BottomBarVisibilityCommunicator::instance());
engine->addImageProvider(QLatin1String("scaling"), new UCScalingImageProvider);
// register gicon provider
- engine->addImageProvider(QLatin1String("gicon"), new GIconProvider);
+ //engine->addImageProvider(QLatin1String("gicon"), new GIconProvider);
// Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
QGuiApplication::primaryScreen()->setOrientationUpdateMask(
=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro 2013-05-21 11:06:55 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro 2013-06-03 22:20:00 +0000
@@ -1,13 +1,15 @@
include( ../../../../common.pri )
-unix {
- CONFIG += link_pkgconfig
- PKGCONFIG += gio-2.0
-}
+#unix {
+# CONFIG += link_pkgconfig
+# PKGCONFIG += gio-2.0
+#}
+unix:INCLUDEPATH += /usr/local/opt/gettext/include/
+unix:LIBS += -L/usr/local/opt/gettext/lib -lintl
TEMPLATE = lib
TARGET = ../UbuntuComponents
-QT += qml quick quick-private dbus
+QT += qml quick quick-private #dbus
CONFIG += qt plugin no_keywords
#needed by ItemStyleAttached
@@ -34,11 +36,11 @@
ucunits.h \
ucqquickimageextension.h \
quickutils.h \
- giconprovider.h \
+# giconprovider.h \
shapeitemtexture.h \
shapeitem.h \
inversemouseareatype.h \
- bottombarvisibilitycommunicator.h \
+# bottombarvisibilitycommunicator.h \
qquickclipboard.h \
qquickmimedata.h \
qquickclipboard_p.h \
@@ -61,10 +63,10 @@
ucunits.cpp \
ucqquickimageextension.cpp \
quickutils.cpp \
- giconprovider.cpp \
+# giconprovider.cpp \
shapeitem.cpp \
inversemouseareatype.cpp \
- bottombarvisibilitycommunicator.cpp \
+# bottombarvisibilitycommunicator.cpp \
qquickclipboard.cpp \
qquickmimedata.cpp \
selector.cpp \
=== modified file 'tests/unit/plugin_dependency.pri'
--- tests/unit/plugin_dependency.pri 2012-12-10 12:15:49 +0000
+++ tests/unit/plugin_dependency.pri 2013-06-03 21:55:14 +0000
@@ -1,7 +1,7 @@
COMPONENTS_PATH = ../../../modules/Ubuntu/Components
INCLUDEPATH += $$COMPONENTS_PATH/plugin
-PRE_TARGETDEPS = $$COMPONENTS_PATH/libUbuntuComponents.so
-LIBS += $$COMPONENTS_PATH/libUbuntuComponents.so
+PRE_TARGETDEPS = $$COMPONENTS_PATH/libUbuntuComponents.dylib
+LIBS += $$COMPONENTS_PATH/libUbuntuComponents.dylib
DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
components.target = $$PRE_TARGETDEPS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment