diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 17:24:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 17:24:39 (GMT) |
| commit | e132e88cfe3eaa0155f7c951168954b67280b374 (patch) | |
| tree | 740fc4caed20cb58186697c36174b5867b790aa5 /src/gui/styles | |
| parent | 3cd611df87645df05fcc747ebb5dcebff05132e4 (diff) | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| download | Qt-e132e88cfe3eaa0155f7c951168954b67280b374.zip Qt-e132e88cfe3eaa0155f7c951168954b67280b374.tar.gz Qt-e132e88cfe3eaa0155f7c951168954b67280b374.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstylefactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylefactory.cpp b/src/gui/styles/qstylefactory.cpp index 0dbb21f..9009878 100644 --- a/src/gui/styles/qstylefactory.cpp +++ b/src/gui/styles/qstylefactory.cpp @@ -81,7 +81,7 @@ QT_BEGIN_INCLUDE_NAMESPACE QT_END_INCLUDE_NAMESPACE #endif -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QStyleFactoryInterface_iid, QLatin1String("/styles"), Qt::CaseInsensitive)) #endif |