Fix another FTBFS

pull/1/head
Timothy Pearson 12 years ago
parent b6de2f2ddd
commit 95063f60a5

@ -122,11 +122,7 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID)
// try to load Plugin // try to load Plugin
int error = 0; int error = 0;
KPluginInfo* info = infoForPluginID(pluginID); KPluginInfo* info = infoForPluginID(pluginID);
<<<<<<< HEAD:tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp
Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ),
=======
Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "TDENetworkManager/Plugin" ), Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "TDENetworkManager/Plugin" ),
>>>>>>> 75d5225a52e81e369e4bcef45bee258724573688:tdenetworkmanager/src/tdenetman-pluginmanager.cpp
TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error ); TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error );
// plugin loaded? // plugin loaded?

@ -14,6 +14,7 @@ add_definitions( -UQT_NO_ASCII_CAST )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}

@ -14,6 +14,7 @@ add_definitions( -UQT_NO_ASCII_CAST )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}

@ -14,6 +14,7 @@ add_definitions( -UQT_NO_ASCII_CAST )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings
${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}

Loading…
Cancel
Save