apaku at gmx.de
Sun Aug 6 14:03:03 UTC 2006
SVN commit 570351 by apaku:
CCMAIL:kdevelop-devel at kdevelop.org
Merge the kdevelop-qmake4 branch into 3.4. This adds the following new
features (also visible in the changelog):
1. Handling of QT variable.
The configuration menu now includes a group box containing all
currently available options for the QT variable (used for the
inclusion of different Qt4 libs). It also already supports the Qt4.2
option for including QtDBus.
2. Handling of RESOURCES variable.
The IMAGES entry in the variable view is replaced with an RESOURCES
entry for Qt4 projects. This allows for adding .qrc files to the
project via the UI.
3. Cleanups here and there.
I changed some strings to be more meaningful and removed the
duplicate dll option.
4. Import configuration for Qt4 projects.
A new Import configuration was created that automatically sets the
Qt options for a Qt4 project. Also the Qt3 configuration was
updated to set the Qt options for a Qt3 project.
5. New file template for Qt4 resource files.
The new file template includes the basic layout of qrc files and
is added to the "known file templates" for new and imported
M +7 -0 ChangeLog
M +1 -1 buildtools/qmake/filebuffer.cpp
M +145 -25 buildtools/qmake/projectconfigurationdlg.cpp
M +34 -13 buildtools/qmake/projectconfigurationdlg.h
M +517 -197 buildtools/qmake/projectconfigurationdlgbase.ui
M +5 -0 buildtools/qmake/trollprojectpart.cpp
M +1 -0 buildtools/qmake/trollprojectpart.h
M +172 -25 buildtools/qmake/trollprojectwidget.cpp
M +6 -1 buildtools/qmake/trollprojectwidget.h
M +1 -0 languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
M +2 -2 parts/appwizard/imports/Makefile.am
A parts/appwizard/imports/qt4qmake branches/work/kdevelop-qmake4/parts/appwizard/imports/qt4qmake#570340
A parts/appwizard/imports/qt4qmake.kdevelop branches/work/kdevelop-qmake4/parts/appwizard/imports/qt4qmake.kdevelop#570340
M +8 -0 parts/appwizard/imports/qtqmake.kdevelop
M +1 -1 parts/filecreate/file-templates/Makefile.am
A parts/filecreate/file-templates/qrc branches/work/kdevelop-qmake4/parts/filecreate/file-templates/qrc#570340
M +3 -0 parts/filecreate/template-info.xml
More information about the KDevelop-devel