mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 16:44:05 +02:00
Code Issues Releases Wiki Activity

Get rid of our own DEBUG_BUILD switch, we can safely rely on QT_DEBUG/QT_NO_DEBUG

Browse Source
This commit is contained in:
Dominik Schmidt
2013-06-30 13:39:36 +02:00
parent 7a25b55220
commit 9d2bda1b93
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/resolvers/ScriptEngine.cpp
View File

@@ -61,7 +61,7 @@ void
ScriptEngine::javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID ) ScriptEngine::javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID )
{ {
tLog() << "JAVASCRIPT:" << m_scriptPath << message << lineNumber << sourceID; tLog() << "JAVASCRIPT:" << m_scriptPath << message << lineNumber << sourceID;
#ifndef DEBUG_BUILD #ifdef QT_DEBUG
JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Script Resolver Error: %1 %2 %3 %4" ).arg( m_scriptPath ).arg( message ).arg( lineNumber ).arg( sourceID ) ) ); JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Script Resolver Error: %1 %2 %3 %4" ).arg( m_scriptPath ).arg( message ).arg( lineNumber ).arg( sourceID ) ) );
#endif #endif
} }

1
src/tomahawk/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ include( AddAppIconMacro )
# SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) # SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
MESSAGE( "Building in debug mode, enabling all debug updates" ) MESSAGE( "Building in debug mode, enabling all debug updates" )
SET( DEBUG_BUILD ON )
ENDIF() ENDIF()
# build plugins # build plugins

2
src/tomahawk/Config.h.in
View File

@@ -1,8 +1,6 @@
#ifndef CONFIG_H_IN #ifndef CONFIG_H_IN
#define CONFIG_H_IN #define CONFIG_H_IN
#cmakedefine DEBUG_BUILD
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}"

2
src/tomahawk/TomahawkWindow.cpp
View File

@@ -1194,7 +1194,7 @@ TomahawkWindow::showAboutTomahawk()
{ {
QString head, desc; QString head, desc;
#ifdef DEBUG_BUILD #ifdef QT_DEBUG
head = tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>" ) head = tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>" )
.arg( TomahawkUtils::appFriendlyVersion() ) .arg( TomahawkUtils::appFriendlyVersion() )
.arg( qApp->applicationVersion() ); .arg( qApp->applicationVersion() );