Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 2 insertions, 0 deletions

diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index e029cf6cd..53787e501 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -78,6 +78,7 @@ private slots:
     void slotTimeout();
     void slotImageDone(int desk);
     void slotChangeDesktop(int);
+    void slotChangeViewport(int, const QPoint&);
     void slotChangeNumberOfDesktops(int);
     void repaintBackground();
     void desktopResized();
@@ -92,6 +93,7 @@ private:
     int realDesktop();
     int effectiveDesktop();
     int validateDesk(int desk);
+    int m_numberOfViewports;
 
     void renderBackground(int desk);
     void exportBackground(int pixmap, int desk);