alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,391 Commits 1 Branch 0 Tags 40 MiB
a6bcd52059
Commit Graph

7391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Lécureuil
c87dad12e5 Use config-plasma.h instead of config.g 2012-08-24 02:44:08 +02:00
Kevin Ottens
c474486a59 Add missing config.h include 2012-08-23 22:10:24 +02:00
Nicolas Lécureuil
1e9c19aa5a Remove useless include 2012-08-23 04:15:32 +02:00
David Faure
96b24f9f93 Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 2012-08-20 18:54:42 +02:00
David Faure
9b571ddec0 Add dummy file so that the "images" subdir exists in git. 
This fixes the packagestructuretest plasma unittest. All green!
 2012-08-19 10:39:57 +02:00
David Faure
986cf06b49 Fix expected result after port to QUrl. 2012-08-19 10:36:34 +02:00
David Faure
b68a8147b2 Update expected test result after port to QUrl 2012-08-18 22:47:41 +02:00
Nicolás Alvarez
d45a12adb7 Merge udisks2 Solid backend into 4.10. 
This code and git history was extracted from the 'frameworks' branch.
 2012-08-17 17:55:41 -03:00
David Faure
fa8d1046ef Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 
Conflicts:
	CMakeLists.txt [version number]
	cmake/modules/KDE4Macros.cmake [modifications to dead code]
	interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop [deleted]
	interfaces/ktexteditor/ktexteditorplugin.desktop [deleted]
	kparts/tests/partviewer.cpp [includes]
	nepomuk/core/nepomukmainmodel.cpp [deleted]
	nepomuk/core/resource.cpp [deleted]
	nepomuk/test/CMakeLists.txt [deleted]
	tier1/kcoreaddons/src/io/klockfile_unix.cpp [already fixed]
	tier1/solid/src/solid/backends/hal/halmanager.cpp [modifications to dead code, AFAICS]
 2012-08-16 13:24:21 +02:00
Frédéric Sheedy
ddbf7df71b Correction of spelling errors for c++ files 2012-08-12 10:56:17 -04:00
Script Kiddy
631d858e6a SVN_SILENT made messages (.desktop file) 2012-08-06 09:28:55 +02:00
Albert Astals Cid
2679fe483e Remove unneeded kcolorutils.h includes 
Found with
diff -ub  <( wcgrep -l "kcolorutils\.h" | sort ) <(wcgrep -l 'KColorUtils::' | sort ) | grep -v CMakeLists.txt | grep ^"-\.
 2012-08-06 00:46:03 +02:00
Albert Astals Cid
3421644d01 Remove unneded kurlmimedata.h include 
Found by
diff -ub  <( wcgrep -l "kurlmimedata\.h" | sort ) <(wcgrep -l 'KUrlMimeData::' | sort ) | grep -v CMakeLists.txt | grep ^"-\."
 2012-08-06 00:38:25 +02:00
Albert Astals Cid
ac117b6c2d Remove unneded kglobal.h includes 
Found with
diff -ub  <( wcgrep -l "kglobal\.h" | sort ) <(wcgrep -l 'KGlobal::\|K_GLOBAL\|KSharedConfigPtr' | sort ) | grep -v CMakeLists.txt | grep ^"-\."
 2012-08-06 00:27:15 +02:00
Kevin Ottens
05e48339e6 Also get rid of the #if defined HAVE_X11 constructs 
Forgot them earlier, they're now ported to just #if HAVE_X11 as well
 2012-08-03 16:53:37 +02:00
Kevin Ottens
77b49e1a8a Use #if HAVE_X11 instead of #ifdef HAVE_X11 as advised by David 2012-08-03 13:00:02 +02:00
Kevin Ottens
6c29469338 Oops, missing a config.h include 2012-08-03 12:20:21 +02:00
Kevin Ottens
22f74fc0ca More removals of Q_WS_* in favor of Q_OS_* or HAVE_X11 2012-08-03 11:45:20 +02:00
Dominik Haumann
54433eaca3 KGlobalSettings::singleClick() -> style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) 
KGlobalSettings::singleClick() is still used in kde3support.
- do we really need kde3support?
- should the singleClick be ported here as well?
 2012-08-02 21:56:05 +02:00
Raphael Kubo da Costa
c0d3b534e2 Merge branch 'KDE/4.8' into KDE/4.9 
Merged via `git merge --log --edit --no-ff --stat -s
recursive'. According to the diffstat, the only actual changes came
from the solid-hal commit below, as expected.

* KDE/4.8:
  HAL: Use the filtering code in HalDevice in devicesFromQuery().
  Fix mem leak (cherry picked from commit b70d6c3d5a021bc37b962c01fc57b6717e9f2868)
  Fix mem leak. Found during debug kmail (cherry picked from commit 0fddae9da44c7edb2140aeb95b4471e2521b1735)
  Allow derived classes to return invalid index in mapToSource.
  SVN_SILENT made messages (.desktop file)
 2012-07-23 22:36:11 -03:00
David Faure
18d587a33d Merge branch 'frameworks' of git://anongit.kde.org/kdelibs into frameworks 2012-07-20 15:14:37 +02:00
David Faure
d930917d95 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks 
Conflicts:
	CMakeLists.txt
	kdecore/tests/kstandarddirstest.cpp
	kdecore/tests/kurltest.cpp
	kdeui/actions/kaction.cpp
	kdeui/tests/CMakeLists.txt
	kio/kio/krun.cpp
	nepomuk/core/nepomukmainmodel.cpp [gone]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcemanager.cpp [gone]
	nepomuk/core/resourcemanager_p.h [gone]
	staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/itemmodels/src/kviewstateserializer.cpp
 2012-07-20 15:10:26 +02:00
Albert Astals Cid
75ccb1b463 More K_GLOBAL_STATIC -> Q_GLOBAL_STATIC porting 
Acked by dfaure
REVIEW: 105611
 2012-07-19 21:19:01 +02:00
Script Kiddy
d3e78d9b8f SVN_SILENT made messages (.desktop file) 2012-07-19 15:53:10 +02:00
Script Kiddy
52fbecaf2c SVN_SILENT made messages (.desktop file) 2012-07-19 10:11:11 +02:00
David Faure
402baf422d Merge branch 'KDE/4.8' into KDE/4.9 2012-07-17 23:17:30 +02:00
Marco Martin
f65d8b2abb move all ContainmentPrivate impl in own file 2012-07-17 14:21:45 +02:00
Marco Martin
4a747bf164 appletprivate.cpp -> applet_p.cpp 2012-07-17 13:44:50 +02:00
Marco Martin
095a196120 move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
David Faure
68a7db068b KUrl::List -> QList<QUrl> everywhere. Make KDirNotify API take urls, to avoid conversions in the caller. 
DBus, however, needs QList<QUrl> <-> QStringList conversions, which is why
both nepomuk and now KIO have methods for this... => submitted to Qt5's QUrl.
 2012-07-15 23:56:29 +02:00
Ignat Semenov
d6b90f183e slots -> Q_SLOTS 2012-07-15 23:28:36 +04:00
Ignat Semenov
3c46a565df slots -> Q_SLOTS 2012-07-15 23:26:14 +04:00
Marco Martin
1614ea5cf9 use the window attribute fot the tooltip test 2012-07-12 13:32:43 +02:00
Marco Martin
8c8d4bfb09 fix the border disable logic 2012-07-12 11:58:58 +02:00
Marco Martin
e571a8ea6e don't cut broeders for tooltips 2012-07-12 11:14:14 +02:00
Benjamin Port
e3e6489165 Change some call to KLineEdit::setClickMessage to QLineEdit::setPlaceholderText 2012-07-07 03:11:37 +02:00
David Faure
9d6bf88aba My computer isn't that fast apparently... 2012-07-06 09:08:17 +02:00
David Faure
fc73e05210 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks 
Conflicts:
	CMakeLists.txt [versioning]
	kio/kio/accessmanager.cpp [headers]
	tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
	tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]
 2012-07-02 15:53:39 +02:00
David Faure
978df0524d Port away from KStandardDirs::realFilePath() 2012-07-01 10:23:15 +02:00
Marco Martin
daef7975e1 close a toolbox on mouse ress anywhere 
BUG:260964
FIXED-IN:4.9
 2012-06-27 12:33:07 +02:00
David Faure
ca9720b3d8 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	CMakeLists.txt
	kdeui/actions/kaction.cpp
	tier1/solid/src/solid/powermanagement.cpp
 2012-06-26 19:27:14 +02:00
Script Kiddy
6efd9f1c99 SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00
Andre Woebbeking
5b735cfec0 -pedantic 2012-06-24 23:10:47 +02:00
David Faure
02260596a2 Fix compilation with Qt4 2012-06-23 01:00:19 +02:00
David Faure
747733bb41 Enable X11 code paths in the Qt5 build. 
Change a number of Q_WS_X11 to HAVE_X11, fix compilation, cleanups.
Ported KWindowSystem to Q_GLOBAL_STATIC, to remove awful K_GLOBAL_STATIC fork.
Delete _qws and _qpa stubs for kwindowsystem, we need the x11 one on x11.
 2012-06-23 00:24:52 +02:00
Marco Martin
988737b128 fix behavior when hint-bar-stretch is present 2012-06-21 15:32:52 +02:00
Marco Martin
1b5bf827c6 don't create handles when applet-in-applet 
yet another reason why this shouldn't be done ever
BUG:301648
 2012-06-21 10:35:55 +02:00
David Faure
5118a8d226 last kmimetype -> qmimetype port 2012-06-21 09:19:32 +02:00
David Faure
127c54fd1c The restructuring in 02dcf75a073017a049db70e3e duplicated some code, 
including this list of mimetypes, so it wasn't updated after the changes
in 4.8 (897b07485a8c) got merged into the other copy of this code, in this same file...

CCMAIL: aseigo@kde.org
 2012-06-21 00:04:24 +02:00
David Faure
1480efc1ce Fix compilation, by reverting package.cpp to before the merge 
and redoing c5f36b67f4d3a98fe93dcbef7fb3361248e69b1b
(removal of KIO code path) by hand.
 2012-06-20 23:58:30 +02:00