diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
| commit | d59c722c306fa39fcecf011b411b77faffca5cbd (patch) | |
| tree | d6a3582523245b624d1a905d4b46d8344429e617 /community/qdevelop/qt47.patch | |
| parent | 939541abc901bd03328b55aaed0fb1862f803c05 (diff) | |
| parent | 5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gri/PKGBUILD
community/multiget/PKGBUILD
core/bash/PKGBUILD
core/grep/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/dib0700-fix.patch
libre/linux-libre/i915-fix-ghost-tv-output.patch
libre/linux-libre/i915-fix-incorrect-error-message.patch
libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
libre/linux-libre/linux-libre.install
libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'community/qdevelop/qt47.patch')
| -rw-r--r-- | community/qdevelop/qt47.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/community/qdevelop/qt47.patch b/community/qdevelop/qt47.patch new file mode 100644 index 000000000..a1607779b --- /dev/null +++ b/community/qdevelop/qt47.patch @@ -0,0 +1,24 @@ +Description: Fix FTBFS with Qt 4.7. + +--- qdevelop-0.28.orig/src/build.h ++++ qdevelop-0.28/src/build.h +@@ -56,7 +56,7 @@ private: + int m_warnings; + QString m_forceMode; + signals: +- void message(QString, QString=0); ++ void message(QString, QString=QString()); + protected slots: + void slotBuildMessages(); + void slotStopBuild(); +--- qdevelop-0.28.orig/src/textEdit.h ++++ qdevelop-0.28/src/textEdit.h +@@ -142,7 +142,7 @@ public: + void setMouseHidden( bool hidden ); + public slots: + void gotoLine( int line, bool moveTop ); +- void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=0, QTextDocument::FindFlags options=0, bool fromButton=false); ++ void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=QString(), QTextDocument::FindFlags options=0, bool fromButton=false); + void slotIndent(bool indent=true); + void slotUnindent(); + void comment(ActionComment action); |