projects
/
mdictionary
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
[mdictionary]
/
src
/
mdictionary
/
gui
/
WelcomeScreenWidget.h
diff --git
a/src/mdictionary/gui/WelcomeScreenWidget.h
b/src/mdictionary/gui/WelcomeScreenWidget.h
index
6e82a87
..
5c596d3
100644
(file)
--- a/
src/mdictionary/gui/WelcomeScreenWidget.h
+++ b/
src/mdictionary/gui/WelcomeScreenWidget.h
@@
-31,8
+31,8
@@
#include <QScrollArea>
#include <QtGui>
#include <QtDeclarative/QDeclarativeView>
#include <QScrollArea>
#include <QtGui>
#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
+//#include <QtDeclarative/QDeclarativeEngine>
+//#include <QtDeclarative/QDeclarativeContext>
//! Displays welcome screen with logo and name of application
class WelcomeScreenWidget : public QScrollArea
//! Displays welcome screen with logo and name of application
class WelcomeScreenWidget : public QScrollArea
@@
-46,8
+46,8
@@
private:
QLabel* mainLabel, * licenseLabel, *imageLabel;
QDeclarativeView* qmlView;
QLabel* mainLabel, * licenseLabel, *imageLabel;
QDeclarativeView* qmlView;
- QDeclarativeEngine* engine;
- QDeclarativeContext* context;
+// QDeclarativeEngine* engine;
+// QDeclarativeContext* context;
QWidget* widget;
};
QWidget* widget;
};