From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:21 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- win/pro_files/interfaces/interfaces.pro | 2 +- .../interfaces/ktexteditor/ktexteditor.pro | 74 ---------------------- .../interfaces/tdetexteditor/tdetexteditor.pro | 74 ++++++++++++++++++++++ win/pro_files/kabc/kabc.pro | 2 +- win/pro_files/kate/interfaces/interfaces.pro | 4 +- win/pro_files/kate/part/part.pro | 6 +- win/pro_files/kdewidgets/kdewidgets.pro | 4 +- .../kio/kfile/tests/kfiletreeviewtest.pro | 2 +- win/pro_files/kio/kio.pro | 2 +- win/pro_files/kmdi/kmdi.pro | 31 --------- win/pro_files/kmdi/test/test.pro | 25 -------- win/pro_files/kparts/kparts.pro | 31 --------- win/pro_files/kresources/kresources.pro | 35 ---------- win/pro_files/kutils/kutils.pro | 26 -------- win/pro_files/tdecore/tdecore.pro | 12 ++-- win/pro_files/tdemdi/tdemdi.pro | 31 +++++++++ win/pro_files/tdemdi/test/test.pro | 25 ++++++++ win/pro_files/tdeparts/tdeparts.pro | 31 +++++++++ win/pro_files/tderesources/tderesources.pro | 35 ++++++++++ win/pro_files/tdeui/tdeui.pro | 6 +- win/pro_files/tdeutils/tdeutils.pro | 26 ++++++++ win/tools/build_tdelibs_dbg | 10 +-- win/tools/build_tdelibs_rel | 10 +-- win/tools/kde_env | 2 +- 24 files changed, 253 insertions(+), 253 deletions(-) delete mode 100644 win/pro_files/interfaces/ktexteditor/ktexteditor.pro create mode 100644 win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro delete mode 100644 win/pro_files/kmdi/kmdi.pro delete mode 100644 win/pro_files/kmdi/test/test.pro delete mode 100644 win/pro_files/kparts/kparts.pro delete mode 100644 win/pro_files/kresources/kresources.pro delete mode 100644 win/pro_files/kutils/kutils.pro create mode 100644 win/pro_files/tdemdi/tdemdi.pro create mode 100644 win/pro_files/tdemdi/test/test.pro create mode 100644 win/pro_files/tdeparts/tdeparts.pro create mode 100644 win/pro_files/tderesources/tderesources.pro create mode 100644 win/pro_files/tdeutils/tdeutils.pro (limited to 'win') diff --git a/win/pro_files/interfaces/interfaces.pro b/win/pro_files/interfaces/interfaces.pro index b766eec14..bffab613b 100644 --- a/win/pro_files/interfaces/interfaces.pro +++ b/win/pro_files/interfaces/interfaces.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ -ktexteditor +tdetexteditor diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro deleted file mode 100644 index 192530e70..000000000 --- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro +++ /dev/null @@ -1,74 +0,0 @@ -TEMPLATE = lib -DEFINES += MAKE_KTEXTEDITOR_LIB - -include( $(KDELIBS)/win/common.pro ) - -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX - -INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/ktexteditor \ - $(KDELIBS)/kabc - -TARGET = ktexteditor$$KDEBUG - -system( bash kmoc ) -system( bash kdcopidl ) - -SOURCES = \ - ktexteditor.cpp \ - editinterface.cpp editinterfaceext.cpp \ - clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \ - codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \ - configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \ - printinterface.cpp highlightinginterface.cpp markinterface.cpp \ - popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \ - editdcopinterface.cpp clipboarddcopinterface.cpp \ - selectiondcopinterface.cpp \ - searchdcopinterface.cpp markinterfaceextension.cpp \ - configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \ - viewstatusmsginterface.cpp editorchooser.cpp \ - blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\ - encodingdcopinterface.cpp \ - printdcopinterface.cpp \ - undodcopinterface.cpp viewcursordcopinterface.cpp \ - viewstatusmsgdcopinterface.cpp \ - selectioninterfaceext.cpp \ - texthintinterface.cpp variableinterface.cpp \ - templateinterface.cpp - -# generated: -SOURCES += \ -selectionextdcopinterface_skel.cpp \ -viewstatusmsgdcopinterface_skel.cpp \ -viewcursordcopinterface_skel.cpp \ -undodcopinterface_skel.cpp \ -printdcopinterface_skel.cpp \ -encodingdcopinterface_skel.cpp \ -documentdcopinfo_skel.cpp \ -blockselectiondcopinterface_skel.cpp \ -searchdcopinterface_skel.cpp \ -selectiondcopinterface_skel.cpp \ -clipboarddcopinterface_skel.cpp \ -editdcopinterface_skel.cpp \ -\ -selectionextdcopinterface_stub.cpp \ -viewstatusmsgdcopinterface_stub.cpp \ -viewcursordcopinterface_stub.cpp \ -undodcopinterface_stub.cpp \ -printdcopinterface_stub.cpp \ -encodingdcopinterface_stub.cpp \ -documentdcopinfo_stub.cpp \ -blockselectiondcopinterface_stub.cpp \ -searchdcopinterface_stub.cpp \ -selectiondcopinterface_stub.cpp \ -clipboarddcopinterface_stub.cpp \ -editdcopinterface_stub.cpp - - -HEADERS = - -INTERFACES = \ -editorchooser_ui.ui diff --git a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro new file mode 100644 index 000000000..421267305 --- /dev/null +++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro @@ -0,0 +1,74 @@ +TEMPLATE = lib +DEFINES += MAKE_KTEXTEDITOR_LIB + +include( $(KDELIBS)/win/common.pro ) + +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX + +INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \ + $(KDELIBS)/kabc + +TARGET = tdetexteditor$$KDEBUG + +system( bash kmoc ) +system( bash kdcopidl ) + +SOURCES = \ + tdetexteditor.cpp \ + editinterface.cpp editinterfaceext.cpp \ + clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \ + codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \ + configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \ + printinterface.cpp highlightinginterface.cpp markinterface.cpp \ + popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \ + editdcopinterface.cpp clipboarddcopinterface.cpp \ + selectiondcopinterface.cpp \ + searchdcopinterface.cpp markinterfaceextension.cpp \ + configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \ + viewstatusmsginterface.cpp editorchooser.cpp \ + blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\ + encodingdcopinterface.cpp \ + printdcopinterface.cpp \ + undodcopinterface.cpp viewcursordcopinterface.cpp \ + viewstatusmsgdcopinterface.cpp \ + selectioninterfaceext.cpp \ + texthintinterface.cpp variableinterface.cpp \ + templateinterface.cpp + +# generated: +SOURCES += \ +selectionextdcopinterface_skel.cpp \ +viewstatusmsgdcopinterface_skel.cpp \ +viewcursordcopinterface_skel.cpp \ +undodcopinterface_skel.cpp \ +printdcopinterface_skel.cpp \ +encodingdcopinterface_skel.cpp \ +documentdcopinfo_skel.cpp \ +blockselectiondcopinterface_skel.cpp \ +searchdcopinterface_skel.cpp \ +selectiondcopinterface_skel.cpp \ +clipboarddcopinterface_skel.cpp \ +editdcopinterface_skel.cpp \ +\ +selectionextdcopinterface_stub.cpp \ +viewstatusmsgdcopinterface_stub.cpp \ +viewcursordcopinterface_stub.cpp \ +undodcopinterface_stub.cpp \ +printdcopinterface_stub.cpp \ +encodingdcopinterface_stub.cpp \ +documentdcopinfo_stub.cpp \ +blockselectiondcopinterface_stub.cpp \ +searchdcopinterface_stub.cpp \ +selectiondcopinterface_stub.cpp \ +clipboarddcopinterface_stub.cpp \ +editdcopinterface_stub.cpp + + +HEADERS = + +INTERFACES = \ +editorchooser_ui.ui diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro index 95f08b747..7e38e3c7d 100644 --- a/win/pro_files/kabc/kabc.pro +++ b/win/pro_files/kabc/kabc.pro @@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KABC_LIB LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\kresources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \ diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro index 22a1527fe..bfcfef97e 100644 --- a/win/pro_files/kate/interfaces/interfaces.pro +++ b/win/pro_files/kate/interfaces/interfaces.pro @@ -8,8 +8,8 @@ DEFINES += MAKE_KATEPARTINTERFACES_LIB TARGET = katepartinterfaces$$KDEBUG LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX + $$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro index 69bfed0be..ad3acfee7 100644 --- a/win/pro_files/kate/part/part.pro +++ b/win/pro_files/kate/part/part.pro @@ -9,13 +9,13 @@ DEFINES += MAKE_KATEPART_LIB TARGET = katepart$$KDELIBDEBUG LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \ - $(KDELIBS)/kutils $(KDELIBS)/tdeprint + $(KDELIBS)/tdeutils $(KDELIBS)/tdeprint system( bash kmoc ) system( bash kdcopidl ) diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro index f3c5cd1f8..8bbf93cd9 100644 --- a/win/pro_files/kdewidgets/kdewidgets.pro +++ b/win/pro_files/kdewidgets/kdewidgets.pro @@ -13,8 +13,8 @@ DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kresources$$KDELIB_SUFFIX + $$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX SOURCES += classpreviews.cpp kdewidgets.cpp diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro index 4e09b8bb9..c2d4afa73 100644 --- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro +++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro @@ -13,7 +13,7 @@ TARGET = kfiletreeviewtest LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX # icon diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro index a6b567661..179de7086 100644 --- a/win/pro_files/kio/kio.pro +++ b/win/pro_files/kio/kio.pro @@ -19,7 +19,7 @@ INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \ $(KDELIBS)/kio/misc/moc \ $(KDELIBS)/kio/bookmarks/moc \ - $(KDELIBS)/kio/kssl/moc $(KDELIBS)/kwallet/client + $(KDELIBS)/kio/kssl/moc $(KDELIBS)/tdewallet/client system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl ) system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl ) diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro deleted file mode 100644 index 2bcc97053..000000000 --- a/win/pro_files/kmdi/kmdi.pro +++ /dev/null @@ -1,31 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - - -# needed to export library classes: -DEFINES += MAKE_KMDI_LIB - -TARGET = kmdi$$KDEBUG - -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX - -INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/tdeui - -system( bash kmoc ) - -SOURCES = \ -kmdichildarea.cpp \ -kmdichildfrm.cpp \ -kmdichildfrmcaption.cpp \ -kmdichildview.cpp \ -kmdidockcontainer.cpp \ -kmdidocumentviewtabwidget.cpp \ -kmdifocuslist.cpp \ -kmdiguiclient.cpp \ -kmdimainfrm.cpp \ -kmditaskbar.cpp \ -kmditoolviewaccessor.cpp - -HEADERS = diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro deleted file mode 100644 index e9536cf43..000000000 --- a/win/pro_files/kmdi/test/test.pro +++ /dev/null @@ -1,25 +0,0 @@ -TEMPLATE = app -#CONFIG = qt warn_on thread - -include( $(KDELIBS)/win/common.pro ) - - -CONFIG -= release -CONFIG -= windows -CONFIG += debug -CONFIG += console - -unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT -unix:LIBS += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts -unix:INCLUDEPATH += . .. $(TDEDIR)/include - -LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX - -HEADERS = hello.h \ - mainwidget.h - -SOURCES = hello.cpp \ - mainwidget.cpp \ - main.cpp - -TARGET = kfourchildren diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/kparts/kparts.pro deleted file mode 100644 index aabdc4d37..000000000 --- a/win/pro_files/kparts/kparts.pro +++ /dev/null @@ -1,31 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - - -# needed to export library classes: -DEFINES += MAKE_KPARTS_LIB - -TARGET = kparts$$KDEBUG - -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX - -INCLUDEPATH += $(KDELIBS)/kio/kfile - -system( bash kmoc ) - -SOURCES = \ -browserextension.cpp \ -browserinterface.cpp \ -browserrun.cpp \ -dockmainwindow.cpp \ -event.cpp \ -factory.cpp \ -historyprovider.cpp \ -mainwindow.cpp \ -part.cpp \ -partmanager.cpp \ -plugin.cpp \ -statusbarextension.cpp - diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/kresources/kresources.pro deleted file mode 100644 index a485b2fba..000000000 --- a/win/pro_files/kresources/kresources.pro +++ /dev/null @@ -1,35 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - - -# needed to export library classes: -DEFINES += MAKE_KRESOURCES_LIB - -INCLUDEPATH += $(KDELIBS)/ab - -LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX - -system( bash kmoc ) -system( bash kdcopidl ) - -TARGET = kresources$$KDEBUG - -SOURCES = \ -configdialog.cpp \ -configpage.cpp \ -configwidget.cpp \ -factory.cpp \ -kcmkresources.cpp \ -managerimpl.cpp \ -resource.cpp \ -selectdialog.cpp \ -testresources.cpp - -generated: -SOURCES += \ -manageriface_skel.cpp \ -manageriface_stub.cpp - -HEADERS = diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/kutils/kutils.pro deleted file mode 100644 index ce4d7fe79..000000000 --- a/win/pro_files/kutils/kutils.pro +++ /dev/null @@ -1,26 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - - -# needed to export library classes: -DEFINES += MAKE_KUTILS_LIB - -TARGET = kutils$$KDEBUG - -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX - -INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor - -system( bash kmoc ) - -SOURCES = \ -kfind.cpp \ -kfinddialog.cpp \ -kmultitabbar.cpp \ -kplugininfo.cpp \ -kreplace.cpp \ -kreplacedialog.cpp - -HEADERS = diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index 21426a32e..ed6662391 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -80,9 +80,9 @@ kglobalaccel.cpp \ kglobalaccel_win.cpp \ kaccelaction.cpp \ kuniqueapplication.cpp \ -ksycoca.cpp \ -ksycocadict.cpp \ -ksycocafactory.cpp \ +tdesycoca.cpp \ +tdesycocadict.cpp \ +tdesycocafactory.cpp \ kapplication.cpp \ kapplication_win.cpp \ kappdcopiface.cpp \ @@ -105,7 +105,7 @@ kclipboard.cpp \ kdebugdcopiface.cpp \ krandomsequence.cpp \ krfcdate.cpp \ -kmultipledrag.cpp \ +tdemultipledrag.cpp \ kipc.cpp \ kuser.cpp \ kaudioplayer.cpp \ @@ -130,8 +130,8 @@ kqiodevicegzip_p.cpp SOURCES += \ kappdcopiface_stub.cpp \ kappdcopiface_skel.cpp \ -ksycoca_stub.cpp \ -ksycoca_skel.cpp \ +tdesycoca_stub.cpp \ +tdesycoca_skel.cpp \ kdebugdcopiface_stub.cpp \ kdebugdcopiface_skel.cpp diff --git a/win/pro_files/tdemdi/tdemdi.pro b/win/pro_files/tdemdi/tdemdi.pro new file mode 100644 index 000000000..7fee597d0 --- /dev/null +++ b/win/pro_files/tdemdi/tdemdi.pro @@ -0,0 +1,31 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + + +# needed to export library classes: +DEFINES += MAKE_KMDI_LIB + +TARGET = tdemdi$$KDEBUG + +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX + +INCLUDEPATH += res $(KDELIBS)/tdeutils $(KDELIBS)/tdeui + +system( bash kmoc ) + +SOURCES = \ +tdemdichildarea.cpp \ +tdemdichildfrm.cpp \ +tdemdichildfrmcaption.cpp \ +tdemdichildview.cpp \ +tdemdidockcontainer.cpp \ +tdemdidocumentviewtabwidget.cpp \ +tdemdifocuslist.cpp \ +tdemdiguiclient.cpp \ +tdemdimainfrm.cpp \ +tdemditaskbar.cpp \ +tdemditoolviewaccessor.cpp + +HEADERS = diff --git a/win/pro_files/tdemdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro new file mode 100644 index 000000000..4a60cd714 --- /dev/null +++ b/win/pro_files/tdemdi/test/test.pro @@ -0,0 +1,25 @@ +TEMPLATE = app +#CONFIG = qt warn_on thread + +include( $(KDELIBS)/win/common.pro ) + + +CONFIG -= release +CONFIG -= windows +CONFIG += debug +CONFIG += console + +unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT +unix:LIBS += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts +unix:INCLUDEPATH += . .. $(TDEDIR)/include + +LIBS += $$KDELIBDESTDIR\tdemdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX + +HEADERS = hello.h \ + mainwidget.h + +SOURCES = hello.cpp \ + mainwidget.cpp \ + main.cpp + +TARGET = kfourchildren diff --git a/win/pro_files/tdeparts/tdeparts.pro b/win/pro_files/tdeparts/tdeparts.pro new file mode 100644 index 000000000..5e724cd1f --- /dev/null +++ b/win/pro_files/tdeparts/tdeparts.pro @@ -0,0 +1,31 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + + +# needed to export library classes: +DEFINES += MAKE_KPARTS_LIB + +TARGET = tdeparts$$KDEBUG + +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX + +INCLUDEPATH += $(KDELIBS)/kio/kfile + +system( bash kmoc ) + +SOURCES = \ +browserextension.cpp \ +browserinterface.cpp \ +browserrun.cpp \ +dockmainwindow.cpp \ +event.cpp \ +factory.cpp \ +historyprovider.cpp \ +mainwindow.cpp \ +part.cpp \ +partmanager.cpp \ +plugin.cpp \ +statusbarextension.cpp + diff --git a/win/pro_files/tderesources/tderesources.pro b/win/pro_files/tderesources/tderesources.pro new file mode 100644 index 000000000..b14c48102 --- /dev/null +++ b/win/pro_files/tderesources/tderesources.pro @@ -0,0 +1,35 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + + +# needed to export library classes: +DEFINES += MAKE_KRESOURCES_LIB + +INCLUDEPATH += $(KDELIBS)/ab + +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX + +system( bash kmoc ) +system( bash kdcopidl ) + +TARGET = tderesources$$KDEBUG + +SOURCES = \ +configdialog.cpp \ +configpage.cpp \ +configwidget.cpp \ +factory.cpp \ +kcmtderesources.cpp \ +managerimpl.cpp \ +resource.cpp \ +selectdialog.cpp \ +testresources.cpp + +generated: +SOURCES += \ +manageriface_skel.cpp \ +manageriface_stub.cpp + +HEADERS = diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro index 26813b1b7..0c8733d55 100644 --- a/win/pro_files/tdeui/tdeui.pro +++ b/win/pro_files/tdeui/tdeui.pro @@ -93,8 +93,8 @@ ksconfig.cpp \ kselect.cpp \ kseparator.cpp \ kshortcutdialog.cpp \ -kspell.cpp \ -kspelldlg.cpp \ +tdespell.cpp \ +tdespelldlg.cpp \ ksplashscreen.cpp \ ksqueezedtextlabel.cpp \ kstatusbar.cpp \ @@ -143,6 +143,6 @@ kmainwindowiface_skel.cpp FORMS = \ kshortcutdialog_advanced.ui \ kshortcutdialog_simple.ui \ -kspellui.ui +tdespellui.ui HEADERS = diff --git a/win/pro_files/tdeutils/tdeutils.pro b/win/pro_files/tdeutils/tdeutils.pro new file mode 100644 index 000000000..f8e035d72 --- /dev/null +++ b/win/pro_files/tdeutils/tdeutils.pro @@ -0,0 +1,26 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + + +# needed to export library classes: +DEFINES += MAKE_KUTILS_LIB + +TARGET = tdeutils$$KDEBUG + +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX + +INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor + +system( bash kmoc ) + +SOURCES = \ +kfind.cpp \ +kfinddialog.cpp \ +tdemultitabbar.cpp \ +kplugininfo.cpp \ +kreplace.cpp \ +kreplacedialog.cpp + +HEADERS = diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg index b252b10ac..5a6c31512 100644 --- a/win/tools/build_tdelibs_dbg +++ b/win/tools/build_tdelibs_dbg @@ -47,15 +47,15 @@ $additional \ tdecore \ tdeui \ kio \ -kresources \ +tderesources \ kabc/vcard \ kabc \ -kutils \ -kparts \ -kmdi \ +tdeutils \ +tdeparts \ +tdemdi \ kioslave/gzip \ kioslave/bzip2 \ -interfaces/ktexteditor \ +interfaces/tdetexteditor \ kate/interfaces \ kate/part \ ; do diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel index 2a9cabbd6..2cd412542 100644 --- a/win/tools/build_tdelibs_rel +++ b/win/tools/build_tdelibs_rel @@ -47,15 +47,15 @@ tdecore \ tdeui \ kstyles/thinkeramik/widget-engine \ kio \ -kresources \ +tderesources \ kabc/vcard \ kabc \ -kutils \ -kparts \ -kmdi \ +tdeutils \ +tdeparts \ +tdemdi \ kioslave/gzip \ kioslave/bzip2 \ -interfaces/ktexteditor \ +interfaces/tdetexteditor \ kate/interfaces \ kate/part \ ; do diff --git a/win/tools/kde_env b/win/tools/kde_env index a8c721a5d..0fbf1410c 100755 --- a/win/tools/kde_env +++ b/win/tools/kde_env @@ -14,7 +14,7 @@ fi # Generic settings export KDELIBS=$KDEWIN\\tdelibs # KDElibs/win32 source directory -export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" +export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" # Version information for binaries # We're changing this from time to time -- cgit v1.2.1