summaryrefslogtreecommitdiff
authorsandman <sandman>2002-07-01 09:45:51 (UTC)
committer sandman <sandman>2002-07-01 09:45:51 (UTC)
commit346ea8fa0d904e940659bc35fad0fc0da8cc7f80 (patch) (side-by-side diff)
tree26e3865ba996ff5154132ed9020cab897cb9ad94
parent05d74acac3af056bfd784c6f2b7f72d313ea64bc (diff)
downloadopie-346ea8fa0d904e940659bc35fad0fc0da8cc7f80.zip
opie-346ea8fa0d904e940659bc35fad0fc0da8cc7f80.tar.gz
opie-346ea8fa0d904e940659bc35fad0fc0da8cc7f80.tar.bz2
Made loading of custom styles much faster, since symbols are now resolved
"on-the-fly" (This only makes it harder for new styles to be debugged)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 6e2db7c..dff8235 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1340,25 +1340,25 @@ void QPEApplication::internalSetStyle( const QString &style )
if (( p1 > 0 ) && ( p2 > 0 ) && (( p1 + 1 ) < p2 ))
style2 = "lib" + style. mid ( p1 + 1, p2 - p1 - 1 ). lower ( ) + ".so";
else
style2 = "lib" + style. lower ( ) + ".so";
// static QLibrary *currentlib = 0;
static void *currentlib = 0;
QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/" + style2;
do { // try/catch simulation
// QLibrary *lib = new QLibrary ( path, QLibrary::Immediately );
- void *lib = ::dlopen ( path. local8Bit ( ), RTLD_NOW | RTLD_GLOBAL );
+ void *lib = ::dlopen ( path. local8Bit ( ), RTLD_LAZY | RTLD_GLOBAL );
if ( lib ) {
//QStyle * (*fpa) ( ) = (QStyle * (*) ( )) lib-> resolve ( "allocate" );
QStyle * (*fpa) ( ) = (QStyle * (*) ( )) ::dlsym ( lib, "allocate" );
if ( fpa ) {
QStyle *sty = ( *fpa ) ( );
if ( sty ) {
setStyle ( sty );
if ( currentlib ) {