[Kde-pim] KDE/kdepim

[Volker Krause]

SVN commit 1166634 by vkrause:

Do not disable the mobile apps by default in a desktop build, same as we
don't disable the desktop apps in the mobile build by default. This
massively reduces the code that is only build in one configuration,
hopefully reducing the amount of build failures considerably as well.
And it allows us to work on the mobile apps without ending up with the
mobile layouts in all the config dialogs of the desktop apps.

Of course, you can still disable the mobile apps (e.g. when building
desktop packages) by using the usual BUILD_mobile=OFF. Also, this does
not change anything if you are using Qt < 4.7 since the mobile apps
require QML and are still disabled if that's not found.

CCMAIL: kde-pim at kde.org


 M  +2 -2      CMakeLists.txt  
 M  +2 -2      incidenceeditors/incidenceeditor-ng/CMakeLists.txt  
 M  +0 -12     messageviewer/headerstyle.cpp  
 M  +2 -6      messageviewer/headerstyle.h  
 M  +2 -0      mobile/CMakeLists.txt  
 M  +0 -2      mobile/mail/messageviewitem.cpp  
 M  +2 -2      runtime/CMakeLists.txt  


--- trunk/KDE/kdepim/CMakeLists.txt #1166633:1166634
@@ -275,9 +275,9 @@
     add_subdirectory(messageviewer)
     macro_optional_add_subdirectory(messagecomposer)
     macro_optional_add_subdirectory(kmail)
-    if (QT_QTDECLARATIVE_FOUND AND KDEPIM_MOBILE_UI)
+    if (QT_QTDECLARATIVE_FOUND)
       macro_optional_add_subdirectory(mobile)
-    endif (QT_QTDECLARATIVE_FOUND AND KDEPIM_MOBILE_UI)
+    endif (QT_QTDECLARATIVE_FOUND)
 
     if(KDEPIM_BUILD_EXAMPLES)
       add_subdirectory(examples)
--- trunk/KDE/kdepim/incidenceeditors/incidenceeditor-ng/CMakeLists.txt #1166633:1166634
@@ -110,7 +110,7 @@
 
 ### Build the mobile version if needed
 
-if (KDEPIM_MOBILE_UI)
+#if (KDEPIM_MOBILE_UI)
   set (incidenceeditors_ng_mobile_LIB_SRCS
     ${incidenceeditors_ng_shared_LIB_SRCS}
   )
@@ -147,7 +147,7 @@
   )
 
   install(TARGETS incidenceeditorsngmobile ${INSTALL_TARGETS_DEFAULT_ARGS})
-endif (KDEPIM_MOBILE_UI)
+#endif (KDEPIM_MOBILE_UI)
 
 
 ### Build the test app TODO: Make optional
--- trunk/KDE/kdepim/messageviewer/headerstyle.cpp #1166633:1166634
@@ -910,8 +910,6 @@
 
 // #####################
 
-#ifdef KDEPIM_MOBILE_UI
-
 class MobileHeaderStyle : public HeaderStyle {
   friend class HeaderStyle;
 protected:
@@ -975,8 +973,6 @@
   return headerStr;
 }
 
-#endif
-
 // #####################
 
 //
@@ -999,9 +995,7 @@
   case Plain:  return plain();
   case Fancy:   return fancy();
   case Enterprise: return enterprise();
-#ifdef KDEPIM_MOBILE_UI
   case Mobile: return mobile();
-#endif
   }
   kFatal() << "Unknown header style ( type ==" << (int)type << ") requested!";
   return 0; // make compiler happy
@@ -1012,9 +1006,7 @@
   if ( lowerType == "brief" ) return brief();
   if ( lowerType == "plain" )  return plain();
   if ( lowerType == "enterprise" )  return enterprise();
-#ifdef KDEPIM_MOBILE_UI
   if ( lowerType ==  "mobile" )  return mobile();
-#endif
   //if ( lowerType == "fancy" ) return fancy(); // not needed, see below
   // don't kFatal here, b/c the strings are user-provided
   // (KConfig), so fail gracefully to the default:
@@ -1025,9 +1017,7 @@
 HeaderStyle * plainStyle = 0;
 HeaderStyle * fancyStyle = 0;
 HeaderStyle * enterpriseStyle = 0;
-#ifdef KDEPIM_MOBILE_UI
 HeaderStyle * mobileStyle = 0;
-#endif
 
 HeaderStyle * HeaderStyle::brief() {
   if ( !briefStyle )
@@ -1053,13 +1043,11 @@
   return enterpriseStyle;
 }
 
-#ifdef KDEPIM_MOBILE_UI
 HeaderStyle * HeaderStyle::mobile() {
   if ( !mobileStyle )
     mobileStyle = new MobileHeaderStyle();
   return mobileStyle;
 }
-#endif
 
 QString HeaderStyle::dateStr(const KDateTime &dateTime)
 {
--- trunk/KDE/kdepim/messageviewer/headerstyle.h #1166633:1166634
@@ -67,10 +67,8 @@
     Brief,
     Plain,
     Fancy,
-    Enterprise
-#ifdef KDEPIM_MOBILE_UI
-    , Mobile
-#endif
+    Enterprise,
+    Mobile
   };
 
   static HeaderStyle * create( Type type );
@@ -80,9 +78,7 @@
   static HeaderStyle * plain();
   static HeaderStyle * fancy();
   static HeaderStyle * enterprise();
-#ifdef KDEPIM_MOBILE_UI
   static HeaderStyle * mobile();
-#endif
 
   //
   // Methods for handling the styles:
--- trunk/KDE/kdepim/mobile/CMakeLists.txt #1166633:1166634
@@ -1,3 +1,5 @@
+add_definitions( -DKDEPIM_MOBILE_UI )
+
 add_subdirectory(lib)
 add_subdirectory(pics)
 
--- trunk/KDE/kdepim/mobile/mail/messageviewitem.cpp #1166633:1166634
@@ -37,8 +37,6 @@
 
 using namespace MessageViewer;
 
-static double sDirectionThreshHold = 8.5; /// Threshold in pixels
-
 MessageViewItem::MessageViewItem( QDeclarativeItem* parent )
   : DeclarativeAkonadiItem( parent )
 {
--- trunk/KDE/kdepim/runtime/CMakeLists.txt #1166633:1166634
@@ -153,9 +153,9 @@
 endif (KDEPIMLIBS_KRESOURCES_LIBS)
 add_subdirectory(accountwizard)
 endif(NOT WINCE)
-if (QT_QTDECLARATIVE_FOUND AND KDEPIM_MOBILE_UI)
+if (QT_QTDECLARATIVE_FOUND)
   add_subdirectory(qml)
-endif (QT_QTDECLARATIVE_FOUND AND KDEPIM_MOBILE_UI)
+endif (QT_QTDECLARATIVE_FOUND)
 
 #if(OPENSYNC_FOUND)
 #  add_subdirectory(opensync)
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/