Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
79b4dbf3
Commit
79b4dbf3
authored
Sep 28, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: remove Qt versions 4.3-4.5 specific code
parent
af4dea1b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
18 deletions
+2
-18
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+0
-2
modules/gui/qt4/dialogs/extensions.cpp
modules/gui/qt4/dialogs/extensions.cpp
+0
-5
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+2
-6
modules/gui/qt4/util/pictureflow.cpp
modules/gui/qt4/util/pictureflow.cpp
+0
-5
No files found.
modules/gui/qt4/components/open_panels.cpp
View file @
79b4dbf3
...
@@ -592,9 +592,7 @@ NetOpenPanel::~NetOpenPanel()
...
@@ -592,9 +592,7 @@ NetOpenPanel::~NetOpenPanel()
mrlList
<<
ui
.
urlComboBox
->
itemText
(
i
);
mrlList
<<
ui
.
urlComboBox
->
itemText
(
i
);
/* Clean the list... */
/* Clean the list... */
#if HAS_QT45
mrlList
.
removeDuplicates
();
mrlList
.
removeDuplicates
();
#endif
/* ...and save the 8 last entries */
/* ...and save the 8 last entries */
getSettings
()
->
setValue
(
"Open/netMRL"
,
mrlList
);
getSettings
()
->
setValue
(
"Open/netMRL"
,
mrlList
);
}
}
...
...
modules/gui/qt4/dialogs/extensions.cpp
View file @
79b4dbf3
...
@@ -186,13 +186,8 @@ ExtensionDialog::ExtensionDialog( intf_thread_t *_p_intf,
...
@@ -186,13 +186,8 @@ ExtensionDialog::ExtensionDialog( intf_thread_t *_p_intf,
this
,
parentDestroyed
()
);
this
,
parentDestroyed
()
);
msg_Dbg
(
p_intf
,
"Creating a new dialog: '%s'"
,
p_dialog
->
psz_title
);
msg_Dbg
(
p_intf
,
"Creating a new dialog: '%s'"
,
p_dialog
->
psz_title
);
#if HAS_QT45
this
->
setWindowFlags
(
Qt
::
WindowMinMaxButtonsHint
this
->
setWindowFlags
(
Qt
::
WindowMinMaxButtonsHint
|
Qt
::
WindowCloseButtonHint
);
|
Qt
::
WindowCloseButtonHint
);
#else
this
->
setWindowFlags
(
Qt
::
WindowMinMaxButtonsHint
);
#endif
this
->
setWindowTitle
(
qfu
(
p_dialog
->
psz_title
)
);
this
->
setWindowTitle
(
qfu
(
p_dialog
->
psz_title
)
);
layout
=
new
QGridLayout
(
this
);
layout
=
new
QGridLayout
(
this
);
...
...
modules/gui/qt4/qt4.hpp
View file @
79b4dbf3
...
@@ -36,14 +36,10 @@
...
@@ -36,14 +36,10 @@
#define QT_NO_CAST_TO_ASCII
#define QT_NO_CAST_TO_ASCII
#include <QString>
#include <QString>
#if ( QT_VERSION < 0x040400 )
#if ( QT_VERSION < 0x040600 )
# error Update your Qt version to at least 4.4.0
# error Update your Qt version to at least 4.6.0
#endif
#if QT_VERSION == 0x040500
# error Please update Qt version to 4.5.1. 4.5.0 is too buggy
#endif
#endif
#define HAS_QT45 ( QT_VERSION >= 0x040500 )
#define HAS_QT47 ( QT_VERSION >= 0x040700 )
#define HAS_QT47 ( QT_VERSION >= 0x040700 )
enum
{
enum
{
...
...
modules/gui/qt4/util/pictureflow.cpp
View file @
79b4dbf3
...
@@ -28,11 +28,6 @@
...
@@ -28,11 +28,6 @@
#include "pictureflow.hpp"
#include "pictureflow.hpp"
#include "components/playlist/ml_model.hpp"
#include "components/playlist/ml_model.hpp"
// detect Qt version
#if QT_VERSION < 0x040300
#error PictureFlow widgets need Qt 4.3 or later
#endif
#include <QApplication>
#include <QApplication>
#include <QImage>
#include <QImage>
#include <QKeyEvent>
#include <QKeyEvent>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment