Commit bc6bebc4 authored by Michael Reeves's avatar Michael Reeves
Browse files

*repress .moc not generated noise.

*don't allow cast from QByteArray to QString.
parent f17c7ce8
...@@ -24,7 +24,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod ...@@ -24,7 +24,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod
SET(KDiff3_LIBRARIES KF5::I18n KF5::KDELibs4Support) SET(KDiff3_LIBRARIES KF5::I18n KF5::KDELibs4Support)
add_definitions(${QT_DEFINITIONS} ${KF5_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KF5_DEFINITIONS})
#remove unnneeded errors #remove unnneeded errors
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_KEYWORDS)
include_directories( include_directories(
${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS}
......
...@@ -3448,4 +3448,4 @@ void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWin ...@@ -3448,4 +3448,4 @@ void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWin
} }
#include "directorymergewindow.moc" //#include "directorymergewindow.moc"
...@@ -1004,4 +1004,4 @@ void KDiff3App::slotStatusMsg( const QString &text ) { ...@@ -1004,4 +1004,4 @@ void KDiff3App::slotStatusMsg( const QString &text ) {
#include "kdiff3.moc" //#include "kdiff3.moc"
...@@ -166,4 +166,4 @@ void KDiff3Shell::slotNewInstance( const QString& fn1, const QString& fn2, const ...@@ -166,4 +166,4 @@ void KDiff3Shell::slotNewInstance( const QString& fn1, const QString& fn2, const
( ( KDiff3App* )pKDiff3Shell->m_part->widget() )->completeInit( fn1, fn2, fn3 ); ( ( KDiff3App* )pKDiff3Shell->m_part->widget() )->completeInit( fn1, fn2, fn3 );
} }
#include "kdiff3_shell.moc" //#include "kdiff3_shell.moc"
...@@ -3147,4 +3147,4 @@ bool WindowTitleWidget::eventFilter( QObject* o, QEvent* e ) { ...@@ -3147,4 +3147,4 @@ bool WindowTitleWidget::eventFilter( QObject* o, QEvent* e ) {
return false; return false;
} }
#include "mergeresultwindow.moc" //#include "mergeresultwindow.moc"
...@@ -638,4 +638,4 @@ void RegExpTester::slotRecalc() { ...@@ -638,4 +638,4 @@ void RegExpTester::slotRecalc() {
} }
} }
#include "smalldialogs.moc" //#include "smalldialogs.moc"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment