Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
1483c9c0
Commit
1483c9c0
authored
16 years ago
by
Friedemann Kleint
Browse files
Options
Downloads
Patches
Plain Diff
Fixes: Remove dependencies to Qt private headers (shared resource editor)
RevBy: Eike Details: Remove leftover defines/includes
parent
6fa1084b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/shared/qrceditor/qrceditor.pri
+0
-8
0 additions, 8 deletions
src/shared/qrceditor/qrceditor.pri
src/shared/qrceditor/resourcefile_p.h
+2
-10
2 additions, 10 deletions
src/shared/qrceditor/resourcefile_p.h
with
2 additions
and
18 deletions
src/shared/qrceditor/qrceditor.pri
+
0
−
8
View file @
1483c9c0
QT_BUILD_TREE=$$(QT_BUILD_TREE)
isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$$(QTDIR)
QT_QRC_BUILD_TREE = $$fromfile($$QT_BUILD_TREE/.qmake.cache,QT_SOURCE_TREE)
INCLUDEPATH *= $$QT_QRC_BUILD_TREE/tools/designer/src/lib/shared
INCLUDEPATH *= $$PWD $$PWD/..
INCLUDEPATH *= $$PWD $$PWD/..
QT *= xml
QT *= xml
DEFINES *= QT_NO_SHARED_EXPORT
# Input
# Input
SOURCES += \
SOURCES += \
$$PWD/resourcefile.cpp \
$$PWD/resourcefile.cpp \
...
@@ -21,7 +14,6 @@ HEADERS += \
...
@@ -21,7 +14,6 @@ HEADERS += \
$$PWD/resourceview.h \
$$PWD/resourceview.h \
$$PWD/qrceditor.h \
$$PWD/qrceditor.h \
$$PWD/undocommands_p.h \
$$PWD/undocommands_p.h \
\
$$PWD/../namespace_global.h \
$$PWD/../namespace_global.h \
FORMS += $$PWD/qrceditor.ui
FORMS += $$PWD/qrceditor.ui
...
...
This diff is collapsed.
Click to expand it.
src/shared/qrceditor/resourcefile_p.h
+
2
−
10
View file @
1483c9c0
...
@@ -42,18 +42,10 @@
...
@@ -42,18 +42,10 @@
#include
<QtCore/QStringList>
#include
<QtCore/QStringList>
#include
<QtGui/QIcon>
#include
<QtGui/QIcon>
#include
"shared_global_p.h"
QT_BEGIN_NAMESPACE
QT_BEGIN_NAMESPACE
namespace
qdesigner_internal
{
namespace
qdesigner_internal
{
#ifdef BUILD_VSIP
# define RESOURCE_EXPORT
#else
# define RESOURCE_EXPORT QDESIGNER_SHARED_EXPORT
#endif
struct
File
;
struct
File
;
struct
Prefix
;
struct
Prefix
;
...
@@ -125,7 +117,7 @@ typedef QList<Prefix *> PrefixList;
...
@@ -125,7 +117,7 @@ typedef QList<Prefix *> PrefixList;
Represents the structure of a Qt Resource File (.qrc) file.
Represents the structure of a Qt Resource File (.qrc) file.
*/
*/
class
RESOURCE_EXPORT
ResourceFile
class
ResourceFile
{
{
public:
public:
ResourceFile
(
const
QString
&
file_name
=
QString
());
ResourceFile
(
const
QString
&
file_name
=
QString
());
...
@@ -199,7 +191,7 @@ private:
...
@@ -199,7 +191,7 @@ private:
Wraps a \l ResourceFile as a single-column tree model.
Wraps a \l ResourceFile as a single-column tree model.
*/
*/
class
RESOURCE_EXPORT
ResourceModel
:
public
QAbstractItemModel
class
ResourceModel
:
public
QAbstractItemModel
{
{
Q_OBJECT
Q_OBJECT
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment