diff options
Diffstat (limited to 'buildtools/qmake')
| -rw-r--r-- | buildtools/qmake/choosesubprojectdlgbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/createscopedlgbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/disablesubprojectdlgbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/newwidgetdlgbase.ui | 4 | ||||
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlgbase.ui | 4 | ||||
| -rw-r--r-- | buildtools/qmake/qmakeoptionswidgetbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/qmakescopeitem.cpp | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index fa8051e6..df01a06c 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -126,7 +126,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui index 1c6cde9e..4ba7212e 100644 --- a/buildtools/qmake/createscopedlgbase.ui +++ b/buildtools/qmake/createscopedlgbase.ui @@ -316,7 +316,7 @@ <tabstop>incUrl</tabstop> <tabstop>checkNotInc</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index edc2856c..d7b78289 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -117,7 +117,7 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 404fa7d3..178fa761 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -224,6 +224,6 @@ <slot>subclassingPressed()</slot> <slot>templateSelChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 0ce31c82..2df4d131 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -2836,8 +2836,8 @@ <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui index 0f3d52d1..312536bc 100644 --- a/buildtools/qmake/qmakeoptionswidgetbase.ui +++ b/buildtools/qmake/qmakeoptionswidgetbase.ui @@ -208,7 +208,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string> </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index c49bbe79..f3cebef2 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -807,9 +807,9 @@ QMakeScopeItem* QMakeScopeItem::projectFileItem() { if( scope->scopeType() != Scope::ProjectScope ) { - QMakeScopeItem* tqparentitem = dynamic_cast<QMakeScopeItem*>(tqparent()); - if( tqparentitem ) - return tqparentitem->projectFileItem(); + QMakeScopeItem* parentitem = dynamic_cast<QMakeScopeItem*>(tqparent()); + if( parentitem ) + return parentitem->projectFileItem(); } return this; } |