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/qtconfig.pro | |
| 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/qtconfig.pro')
| -rw-r--r-- | tools/qtconfig/qtconfig.pro | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro index d1fd320..cb06e5a 100644 --- a/tools/qtconfig/qtconfig.pro +++ b/tools/qtconfig/qtconfig.pro @@ -1,11 +1,10 @@ TEMPLATE = app -CONFIG += qt warn_on x11 +CONFIG += qt warn_on x11 build_all:!build_pass { CONFIG -= build_all CONFIG += release } LANGUAGE = C++ -QT += qt3support contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER @@ -13,19 +12,17 @@ contains(QT_CONFIG, phonon) { QT += phonon DEFINES += HAVE_PHONON } -SOURCES += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp \ - mainwindowbase.cpp paletteeditoradvancedbase.cpp previewwidgetbase.cpp -HEADERS += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h \ - mainwindowbase.h paletteeditoradvancedbase.h previewwidgetbase.h +SOURCES += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp +HEADERS += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h -FORMS = mainwindowbase.ui paletteeditoradvancedbase.ui previewwidgetbase.ui +FORMS = mainwindow.ui paletteeditoradvanced.ui previewwidget.ui RESOURCES = qtconfig.qrc PROJECTNAME = Qt Configuration -TARGET = qtconfig -DESTDIR = ../../bin +TARGET = qtconfig +DESTDIR = ../../bin target.path=$$[QT_INSTALL_BINS] INSTALLS += target -INCLUDEPATH += . -DBFILE = qtconfig.db +INCLUDEPATH += . +DBFILE = qtconfig.db |