summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsyc://loupsycedyglgamf.onion/~lynX <BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>2016-03-11 03:06:30 +0100
committerpsyc://loupsycedyglgamf.onion/~lynX <BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>2016-03-11 03:06:30 +0100
commit60f33bb71519624c6759af0b1adf491f5f8c2a8b (patch)
treea2d1183c3b0aff3da7df2942a3ef5694c5b1e0df
parent14870dcfe0203f72dc3372ff8afce90bc8b94818 (diff)
parent132de918ffaba51a6fde11716b18c636547fa0ed (diff)
downloadsecushare-60f33bb71519624c6759af0b1adf491f5f8c2a8b.tar.gz
secushare-60f33bb71519624c6759af0b1adf491f5f8c2a8b.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--src/app.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/app.cpp b/src/app.cpp
index bb703da..91d3af7 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -136,9 +136,6 @@ App::registerQmlTypes ()
136 //qmlRegisterUncreatableType<ThreadListModel> 136 //qmlRegisterUncreatableType<ThreadListModel>
137 // (URI, 1, 0, "ThreadListModel", QLatin1String ("Uncreatable type")); 137 // (URI, 1, 0, "ThreadListModel", QLatin1String ("Uncreatable type"));
138 138
139 qmlRegisterUncreatableType<EgoListModel>
140 (URI, 1, 0, "ThreadModel", QLatin1String ("Uncreatable type"));
141
142 qmlRegisterUncreatableType<Helpers> 139 qmlRegisterUncreatableType<Helpers>
143 (URI, 1, 0, "Helpers", QLatin1String ("Uncreatable type")); 140 (URI, 1, 0, "Helpers", QLatin1String ("Uncreatable type"));
144 141
@@ -168,7 +165,7 @@ App::registerQmlTypes ()
168} 165}
169 166
170/** 167/**
171 * @brief Gooey::registerImageProvider , registers image handlers to QML engine 168 * Registers image handlers with QML engine.
172 * @param engine 169 * @param engine
173 */ 170 */
174void 171void