diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-28 17:42:06 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-28 18:07:41 (GMT) |
| commit | 5fe25728c0ebb04c3fd2958d902cc58d2064b84d (patch) | |
| tree | 12623614b0c2fbbf483e842235731956dd649ad7 /tools/qtconfig/main.cpp | |
| parent | 74c683c6879dea1cb4eaa99aaf61e16524b8a4a1 (diff) | |
| download | Qt-5fe25728c0ebb04c3fd2958d902cc58d2064b84d.zip Qt-5fe25728c0ebb04c3fd2958d902cc58d2064b84d.tar.gz Qt-5fe25728c0ebb04c3fd2958d902cc58d2064b84d.tar.bz2 | |
Remove qt3support dependency of qtconfig
Revert "Revert the integration of the merge request 2286."
This reverts commit e3edad83a1e6e99a551d40d4118352435c6dd710.
This had been submitted in the Qt 4.7, but reverted because
the change was to intrusive to be pushed in a stable branch.
Now re-apply the change in master.
Conflicts:
tools/qtconfig/mainwindowbase.cpp
tools/qtconfig/mainwindowbase.h
tools/qtconfig/paletteeditoradvancedbase.cpp
tools/qtconfig/paletteeditoradvancedbase.h
tools/qtconfig/paletteeditoradvancedbase.ui
tools/qtconfig/previewwidgetbase.cpp
tools/qtconfig/previewwidgetbase.h
tools/qtconfig/previewwidgetbase.ui
tools/tools.pro
Diffstat (limited to 'tools/qtconfig/main.cpp')
| -rw-r--r-- | tools/qtconfig/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qtconfig/main.cpp b/tools/qtconfig/main.cpp index 3c17511..38435d9 100644 --- a/tools/qtconfig/main.cpp +++ b/tools/qtconfig/main.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include "ui_previewwidgetbase.h" #include "mainwindow.h" #include <QApplication> #include <QLibraryInfo> |