[Tux4kids-commits] r1161 - in tux4kids-admin/trunk/tux4kids-admin: plugins/tuxmathPlugin src

[Michał Świtakowski]

Author: swistakers-guest
Date: 2009-07-08 19:38:08 +0000 (Wed, 08 Jul 2009)
New Revision: 1161

Modified:
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro
   tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp
   tux4kids-admin/trunk/tux4kids-admin/src/src.pro
Log:
linking libs to plugin, not GUI (just to test)

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp	2009-07-08 15:06:19 UTC (rev 1160)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp	2009-07-08 19:38:08 UTC (rev 1161)
@@ -1,7 +1,18 @@
+#include <QDebug>
+
 #include "tuxmathPlugin.h"
+#include "applicationDir.h"
+#include "applicationDirTuxmath.h"
 
 TuxmathPlugin::TuxmathPlugin(QObject *parent) : QObject(parent)
 {
+	qDebug() << "let's create ApplicationDir object";
+	ApplicationDir appdir;
+	qDebug() << "it said" << appdir.foo();
+
+	qDebug() << "let's create ApplicationDir object";
+	ApplicationDirTuxmath appdir2;
+	qDebug() << "it said" << appdir2.foo();
 }
 
 TuxmathPlugin::~TuxmathPlugin()

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h	2009-07-08 15:06:19 UTC (rev 1160)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h	2009-07-08 19:38:08 UTC (rev 1161)
@@ -18,7 +18,6 @@
 	QString version() const;
 	QWidget *mainWidget();
 
-
 };
 
 #endif

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro	2009-07-08 15:06:19 UTC (rev 1160)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro	2009-07-08 19:38:08 UTC (rev 1161)
@@ -1,6 +1,8 @@
 TEMPLATE = lib
 CONFIG += plugin
-INCLUDEPATH += ../
+INCLUDEPATH += ../ \
+	       ../../../libtux4kidsadmin \
+	       ../../../libtux4kidsadmin_tuxmath
 HEADERS = tuxmathPlugin.h \
     tuxmathMainWidget.h
 SOURCES = tuxmathPlugin.cpp \
@@ -8,3 +10,6 @@
 TARGET = $$qtLibraryTarget(TuxmathPlugin)
 DESTDIR = ../
 FORMS += tuxmathMainWidget.ui
+LIBS += -ltux4kidsadmin -L../../../libtux4kidsadmin
+LIBS += -ltux4kidsadmintuxmath -L../../../libtux4kidsadmin_tuxmath
+

Modified: tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp	2009-07-08 15:06:19 UTC (rev 1160)
+++ tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp	2009-07-08 19:38:08 UTC (rev 1161)
@@ -2,8 +2,6 @@
 #include <QApplication>
 
 #include "mainController.h"
-#include "applicationDir.h"
-#include "applicationDirTuxmath.h"
 
 MainController::MainController()
 {
@@ -13,16 +11,6 @@
 	if (m_pluginManager.empty()) {
 		qDebug() << tr("Failed to load plugins");
 	}
-
-	qDebug() << "let's create ApplicationDir object";
-	ApplicationDir appdir;
-	qDebug() << "it said" << appdir.foo();
-
-	qDebug() << "let's create ApplicationDir object";
-	ApplicationDirTuxmath appdir2;
-	qDebug() << "it said" << appdir2.foo();
-
-
 }
 
 MainController::~MainController()

Modified: tux4kids-admin/trunk/tux4kids-admin/src/src.pro
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/src.pro	2009-07-08 15:06:19 UTC (rev 1160)
+++ tux4kids-admin/trunk/tux4kids-admin/src/src.pro	2009-07-08 19:38:08 UTC (rev 1161)
@@ -1,8 +1,6 @@
 TARGET = ../tux4kids-admin
 TEMPLATE = app
-INCLUDEPATH += ../plugins/ \
-	       ../../libtux4kidsadmin \
-	       ../../libtux4kidsadmin_tuxmath
+INCLUDEPATH += ../plugins/
 
 SOURCES += main.cpp \
     mainWindow.cpp \
@@ -19,6 +17,5 @@
     errorLog.h
 FORMS += mainWindow.ui \
     pluginManagerDialog.ui
-LIBS += -ltux4kidsadmin -L../../libtux4kidsadmin
-LIBS += -ltux4kidsadmintuxmath -L../../libtux4kidsadmin_tuxmath
 
+