summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-26 12:34:25 (UTC)
committer mickeyl <mickeyl>2005-06-26 12:34:25 (UTC)
commit7eb3ca44b7ff351221b190840270c62c12be6402 (patch) (unidiff)
tree3323eceba9047d56824021f2a3fe4469f61fbe43
parentb4d2fa56d4b4608656f6b5cf3ff9375708395e91 (diff)
downloadopie-7eb3ca44b7ff351221b190840270c62c12be6402.zip
opie-7eb3ca44b7ff351221b190840270c62c12be6402.tar.gz
opie-7eb3ca44b7ff351221b190840270c62c12be6402.tar.bz2
get preffered qte driver name from ODevice instead of hard coding it to
"Transformed". Patch courtesy Manuel Teira.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 5bbed59..8ed8710 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -86,19 +86,19 @@ void initEnvironment()
86 // rotation 86 // rotation
87 int t = ODevice::inst()->rotation(); 87 int t = ODevice::inst()->rotation();
88 odebug << "ODevice reports transformation to be " << t << oendl; 88 odebug << "ODevice reports transformation to be " << t << oendl;
89 89
90 QString env( getenv("QWS_DISPLAY") ); 90 QString env( getenv("QWS_DISPLAY") );
91 if ( env.isEmpty() ) 91 if ( env.isEmpty() )
92 { 92 {
93 int rot = ODevice::inst()->rotation() * 90; 93 int rot = ODevice::inst()->rotation() * 90;
94 QString qws_display = QString("Transformed:Rot%1:0").arg(rot); 94 QString qws_display = QString( "%1:Rot%2:0").arg(ODevice::inst()->qteDriver()).arg(rot);
95 odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl; 95 odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl;
96 setenv("QWS_DISPLAY", (const char*) qws_display, 1); 96 setenv("QWS_DISPLAY", (const char*) qws_display, 1);
97 } 97 }
98 else 98 else
99 odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; 99 odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl;
100 100
101 QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ 101 QPEApplication::defaultRotation(); /* to ensure deforient matches reality */
102} 102}
103 103
104static void initKeyboard() 104static void initKeyboard()
@@ -171,7 +171,7 @@ int initApplication( int argc, char ** argv )
171#endif 171#endif
172 s->show(); 172 s->show();
173 173
174#if 0 174#if 0
175 if ( QDate::currentDate().year() < 2005 ) 175 if ( QDate::currentDate().year() < 2005 )
176 { 176 {
177 if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), 177 if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ),
@@ -188,7 +188,7 @@ int initApplication( int argc, char ** argv )
188 odebug << "--> mainloop in" << oendl; 188 odebug << "--> mainloop in" << oendl;
189 int rv = a.exec(); 189 int rv = a.exec();
190 odebug << "<-- mainloop out" << oendl; 190 odebug << "<-- mainloop out" << oendl;
191 remove_pidfile(); 191 remove_pidfile();
192 odebug << "removing server object..." << oendl; 192 odebug << "removing server object..." << oendl;
193 delete s; 193 delete s;
194 194