diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:06:30 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:06:30 +0100 |
| commit | 91f124cfc23442cc0aca23df9b71f3e561706178 (patch) | |
| tree | a12b3e66aa13153d6edbc4f34aa92da9153af271 /src/activeqt/container/qaxselect.cpp | |
| parent | f55b0d1fa661e4abd2b2c5c0ec20925f0855e887 (diff) | |
| parent | cd3e1f5dd257fbe1d1b86d4f72eea01293d31047 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id54a18b587384a7fc0ee23e1c16a3b929be69cbd
Diffstat (limited to 'src/activeqt/container/qaxselect.cpp')
| -rw-r--r-- | src/activeqt/container/qaxselect.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp index bd1e14c..a6234de 100644 --- a/src/activeqt/container/qaxselect.cpp +++ b/src/activeqt/container/qaxselect.cpp @@ -40,7 +40,6 @@ #include "qaxselect.h" -#ifndef QT_NO_WIN_ACTIVEQT #include "ui_qaxselect.h" #include <QtCore/QSortFilterProxyModel> @@ -351,4 +350,3 @@ void QAxSelect::onFilterLineEditChanged(const QString &text) } QT_END_NAMESPACE -#endif // QT_NO_WIN_ACTIVEQT |