| Age | Commit message (Collapse) | Author |
|
See commit 05689c462745edbaeebcfc63d456877746805451 in kio-extras
|
|
Conflicts:
dolphin/src/search/filenamesearchprotocol.cpp
|
|
This debug output was pushed accidentally in commit
c52ba9446b05e6bc7f890daac406659a9c37c562
|
|
Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.
We should probably merge master into frameworks on a regular basis from
now on.
CCMAIL:[email protected]
Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/search/dolphinfacetswidget.cpp
dolphin/src/statusbar/dolphinstatusbar.cpp
dolphin/src/views/dolphinview.cpp
|
|
|
|
The parameter changed from KUrl to QUrl -> we have to add this.
Found with -Woverloaded-virtual
|
|
This does not work properly yet, there are probably quite a few bad signal/
slot connections due to KUrl -> QUrl. However dolphin starts without
crashing.
Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5
and I have no idea how it is supposed to be used.
This is the first commit for review 117395
|
|
Before this commit, filenamesearch checked if a file's MIME type begins
with "text/" to determine if its content can be searched. This prevented
that text inside shell scripts is found.
BUG: 332143
REVIEW: 116805
FIXED-IN: 4.12.4
|
|
Most developers seem to prefer
if (ptr) ...
if (!ptr) ...
in comparison to
if (ptr != 0) ...
if (ptr == 0) ...
Adjusted the Dolphin-code to use the "most-prefered style" to make contributors happy.
|
|
|
|
Tested with search all files below /
svn path=/trunk/KDE/kdebase/apps/; revision=1214895
|
|
CCBUG: 263262
FIXED-IN: 4.6.0
svn path=/trunk/KDE/kdebase/apps/; revision=1214807
|
|
CCBUG: 262481
svn path=/trunk/KDE/kdebase/apps/; revision=1212998
|
|
svn path=/trunk/KDE/kdebase/apps/; revision=1200303
|
|
the filenamesearchprotocol.
svn path=/trunk/KDE/kdebase/apps/; revision=1183944
|
|
svn path=/trunk/KDE/kdebase/apps/; revision=1154073
|