summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 20:11:33 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 20:11:33 +0000
commitf9c30e41d26594598abaa8315c4488b6c5ff38ea (patch)
tree0f3a5190aef92c865cb3f6a2304c093b949bc1b6 /lib
parent5e2135048c5de59f5351380653961b9a1e260d84 (diff)
downloadtdevelop-f9c30e41d26594598abaa8315c4488b6c5ff38ea.tar.gz
tdevelop-f9c30e41d26594598abaa8315c4488b6c5ff38ea.zip
[kdevelop] compatibility with QT_NO_ASCII_CAST and automoc
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1216512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib')
-rw-r--r--lib/interfaces/extras/kdevcompileroptions.cpp2
-rw-r--r--lib/widgets/kdevhtmlpart.h1
-rw-r--r--lib/widgets/propeditor/propertyeditor.cpp2
-rw-r--r--lib/widgets/propeditor/qeditlistbox.cpp2
4 files changed, 5 insertions, 2 deletions
diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp
index d62130f9..22c701f1 100644
--- a/lib/interfaces/extras/kdevcompileroptions.cpp
+++ b/lib/interfaces/extras/kdevcompileroptions.cpp
@@ -4,3 +4,5 @@ KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name )
:TQObject(parent, name)
{
}
+
+#include "kdevcompileroptions.moc"
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 465fb0a3..4a03eec9 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -14,7 +14,6 @@ Customized KHTML part for KDevelop.
class KAction;
class KToolBarPopupAction;
-class KParts::ReadOnlyPart;
struct DocumentationHistoryEntry {
KURL url;
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index c9e6e85d..3cd974db 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -90,7 +90,7 @@ public:
valueToDraw = m_property->value();
TQColorGroup icg(cg);
#ifndef PURE_QT
- icg.setColor(TQColorGroup::Background, backgroundColor());
+ icg.setColor(TQColorGroup::Background, backgroundColor(column));
#else
icg.setColor(TQColorGroup::Background, white);
#endif
diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp
index e1b09e4e..db40e8e7 100644
--- a/lib/widgets/propeditor/qeditlistbox.cpp
+++ b/lib/widgets/propeditor/qeditlistbox.cpp
@@ -399,3 +399,5 @@ QEditListBox::CustomEditor::CustomEditor( TQComboBox *combo )
m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() );
assert( m_lineEdit );
}
+
+#include "qeditlistbox.moc"