projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix library icon on Mac.
[dorian]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index
647822e
..
c1b25ce
100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-1,4
+1,4
@@
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
#include <unistd.h>
#endif
#include <unistd.h>
#endif
@@
-8,28
+8,44
@@
#include "trace.h"
#include "settings.h"
#include "trace.h"
#include "settings.h"
+static const char *DORIAN_VERSION =
+#include "pkg/version.txt"
+;
+
+static const QtMsgType DORIAN_DEFAULT_TRACE_LEVEL =
+#ifdef Q_OS_SYMBIAN
+ QtDebugMsg
+#else
+ QtWarningMsg
+#endif
+ ;
+
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+
a.setApplicationName("Dorian");
a.setApplicationName("Dorian");
- a.setApplicationVersion("0.0.1");
+ a.setApplicationVersion(DORIAN_VERSION);
a.setOrganizationDomain("pipacs.com");
a.setOrganizationName("Pipacs");
Trace::level = (QtMsgType)Settings::instance()->
a.setOrganizationDomain("pipacs.com");
a.setOrganizationName("Pipacs");
Trace::level = (QtMsgType)Settings::instance()->
- value("tracelevel", (int)QtWarningMsg).toInt();
+ value("tracelevel", (int)DORIAN_DEFAULT_TRACE_LEVEL).toInt();
qInstallMsgHandler(Trace::messageHandler);
MainWindow w;
qInstallMsgHandler(Trace::messageHandler);
MainWindow w;
-#ifdef Q_WS_S60
- w.showMaximized();
-#else
w.show();
w.show();
-#endif
+
+#if 0 // FIXME #ifdef Q_OS_SYMBIAN
+ // Remove context menu from all widgets
+ foreach (QWidget *w, QApplication::allWidgets()) {
+ w->setContextMenuPolicy(Qt::NoContextMenu);
+ }
+#endif // Q_OS_SYMBIAN
int ret = a.exec();
if (ret == 1000) {
int ret = a.exec();
if (ret == 1000) {
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
extern char **environ;
execve(argv[0], argv, environ);
#endif
extern char **environ;
execve(argv[0], argv, environ);
#endif