Make libkonquerorprivate shared (which means it needs export macros now -- done), and installed (in the unlikely case where users might want to use konqueror :) ).

svn path=/trunk/KDE/kdebase/apps/; revision=677969

konqueror/CMakeLists.txt

@@ -66,8 +66,11 @@ kde4_automoc(${konquerorprivate_SRCS})
 
 qt4_add_dbus_interface(konquerorprivate_SRCS org.kde.Konqueror.Main.xml konqueror_interface)
 
-kde4_add_library(konquerorprivate ${konquerorprivate_SRCS})
+kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
 target_link_libraries(konquerorprivate ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} konq)
+set_target_properties(konquerorprivate PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+install(TARGETS konquerorprivate DESTINATION ${LIB_INSTALL_DIR})
+
 
 kde4_add_kdeinit_executable( konqueror konq_main.cc)
 target_link_libraries(kdeinit_konqueror konquerorprivate )

konqueror/konq_actions.cc

@@ -347,7 +347,7 @@ void KonqViewModeAction::slotPopupAboutToHide()
 
 
 KonqHistoryList* KonqMostOftenURLSAction::s_mostEntries = 0;
-uint KonqMostOftenURLSAction::s_maxEntries = 0;
+static int s_maxEntries = 0;
 
 KonqMostOftenURLSAction::KonqMostOftenURLSAction( const QString& text,
 						  QObject* parent )

konqueror/konq_actions.h

@@ -145,7 +145,6 @@ private:
     static void inSort( const KonqHistoryEntry& entry );
 
     static KonqHistoryList *s_mostEntries;
-    static uint s_maxEntries;
     KUrl::List m_popupList;
 };
 

konqueror/konq_application.h

@@ -19,12 +19,13 @@
 #ifndef KONQ_APPLICATION_H
 #define KONQ_APPLICATION_H
 
+#include "konqprivate_export.h"
 #include <kapplication.h>
 
 // This is used to know if we are being closed by session management
 // or by the user. See KonqMainWindow::~KonqMainWindow.
 // Credits to Matthias Ettrich for the idea.
-class KonquerorApplication : public KApplication
+class KONQPRIVATE_EXPORT KonquerorApplication : public KApplication
 {
   Q_OBJECT
 public:

konqueror/konq_factory.h

@@ -22,6 +22,7 @@
 #ifndef __konq_factory_h__
 #define __konq_factory_h__
 
+#include "konqprivate_export.h"
 
 #include <QtCore/QStringList>
 
@@ -31,7 +32,7 @@ class KAboutData;
 class KLibFactory;
 namespace KParts { class ReadOnlyPart; }
 
-class KonqViewFactory // TODO rename to KonqPartFactory?
+class KonqViewFactory // TODO rename to KonqPartFactory? confusing though due to KParts::PartFactory (in the part itself)
 {
 public:
   KonqViewFactory() : m_factory( 0 ), m_createBrowser( false ) {}
@@ -62,7 +63,7 @@ private:
 /**
  * Factory for creating (loading) parts when creating a view.
  */
-class KonqFactory
+class KONQPRIVATE_EXPORT KonqFactory
 {
 public:
     /**

konqueror/konq_mainwindow.h

@@ -22,20 +22,17 @@
 #ifndef __konq_mainwindow_h__
 #define __konq_mainwindow_h__
 
+#include "konqprivate_export.h"
+
 #include <QtCore/QMap>
-#include <QtCore/QPoint>
-#include <QtCore/QTimer>
 #include <QtCore/QPointer>
-//Added by qt3to4:
-#include <QtGui/QPixmap>
-#include <QtCore/QByteRef>
 #include <QtGui/QKeyEvent>
 #include <QtCore/QList>
 #include <QtCore/QEvent>
 #include <QtGui/QLabel>
 
 #include <kfileitem.h>
-#include <klocale.h>
+
 #include "konq_openurlrequest.h"
 
 #include <kparts/mainwindow.h>
@@ -53,6 +50,7 @@
 
 class QFile;
 class QAction;
+class QPixmap;
 class KAction;
 class KActionCollection;
 class KActionMenu;
@@ -87,7 +85,7 @@ namespace KParts {
 
 class KonqExtendedBookmarkOwner;
 
-class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase
+class KONQPRIVATE_EXPORT KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase
 {
   Q_OBJECT
   Q_PROPERTY( int viewCount READ viewCount )

konqueror/konq_misc.h

@@ -20,17 +20,14 @@
 #ifndef _konq_misc_h
 #define _konq_misc_h
 
-// This file can hold every global class for konqueror that used to pollute
-// konq_main.cc
+#include "konqprivate_export.h"
 
 #include <krun.h>
 #include <kparts/browserextension.h>
-//Added by qt3to4:
-#include <QtGui/QKeyEvent>
 class KonqMainWindow;
 class KonqView;
 
-class KonqMisc
+class KONQPRIVATE_EXPORT KonqMisc
 {
 public:
     /*
@@ -61,7 +58,7 @@ public:
     /**
      * Create a new window with a single view, showing @p url, using @p args
      */
-    static KonqMainWindow * createSimpleWindow( const KUrl &url, const KParts::URLArgs &args, 
+    static KonqMainWindow * createSimpleWindow( const KUrl &url, const KParts::URLArgs &args,
 						bool tempFile = false);
 
     /**

konqueror/konq_settingsxt.kcfgc

@@ -2,3 +2,5 @@ File=konqueror.kcfg
 ClassName=KonqSettings
 Singleton=true 
 Mutators=true
+Visibility=KONQPRIVATE_EXPORT
+IncludeFiles=konqprivate_export.h

konqueror/konq_viewmgr.h

@@ -20,13 +20,13 @@
 #ifndef __konq_viewmgr_h__
 #define __konq_viewmgr_h__
 
+#include "konqprivate_export.h"
 #include "konq_factory.h"
 
 #include <QtCore/QMap>
 #include <QtCore/QPointer>
 
 #include <KService>
-#include <KConfig>
 
 #include <kparts/partmanager.h>
 #include "konq_openurlrequest.h"
@@ -35,6 +35,7 @@ class KonqFrameTabs;
 class QString;
 class QTimer;
 class KConfig;
+class KConfigGroup;
 class KonqMainWindow;
 class KonqFrameBase;
 class KonqFrameContainer;
@@ -47,7 +48,7 @@ namespace KParts
   class ReadOnlyPart;
 }
 
-class KonqViewManager : public KParts::PartManager
+class KONQPRIVATE_EXPORT KonqViewManager : public KParts::PartManager
 {
     Q_OBJECT
 public:

konqueror/konqprivate_export.h

@@ -0,0 +1,49 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2007 David Faure <faure@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KONQPRIVATE_EXPORT_H
+#define KONQPRIVATE_EXPORT_H
+
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
+#include <kdemacros.h>
+
+/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */
+#if defined _WIN32 || defined _WIN64
+
+#ifndef KONQPRIVATE_EXPORT
+# if defined(MAKE_KONQUERORPRIVATE_LIB)
+   /* We are building this library */ 
+#  define KONQPRIVATE_EXPORT KDE_EXPORT
+# else
+   /* We are using this library */ 
+#  define KONQPRIVATE_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#else /* UNIX */
+
+#define KONQPRIVATE_EXPORT KDE_EXPORT
+
+#endif
+
+# ifndef KONQPRIVATE_EXPORT_DEPRECATED
+#  define KONQPRIVATE_EXPORT_DEPRECATED KDE_DEPRECATED KONQPRIVATE_EXPORT
+# endif
+
+#endif

konqueror/preloader/CMakeLists.txt

@@ -1,4 +1,4 @@
-include_directories( ${CMAKE_SOURCE_DIR}/konqueror )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. )
 
 
 ########### next target ###############