From 1483c9c0f8c6ed2853a39703cf530f8a00658ff2 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 9 Feb 2009 12:04:07 +0100
Subject: [PATCH] Fixes: Remove dependencies to Qt private headers (shared
resource editor)
RevBy: Eike
Details: Remove leftover defines/includes
---
src/shared/qrceditor/qrceditor.pri | 8 --------
src/shared/qrceditor/resourcefile_p.h | 12 ++----------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/shared/qrceditor/qrceditor.pri b/src/shared/qrceditor/qrceditor.pri
index 3efd26553f7..47e54c936e1 100644
--- a/src/shared/qrceditor/qrceditor.pri
+++ b/src/shared/qrceditor/qrceditor.pri
@@ -1,14 +1,7 @@
-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/..
QT *= xml
-DEFINES *= QT_NO_SHARED_EXPORT
-
# Input
SOURCES += \
$$PWD/resourcefile.cpp \
@@ -21,7 +14,6 @@ HEADERS += \
$$PWD/resourceview.h \
$$PWD/qrceditor.h \
$$PWD/undocommands_p.h \
- \
$$PWD/../namespace_global.h \
FORMS += $$PWD/qrceditor.ui
diff --git a/src/shared/qrceditor/resourcefile_p.h b/src/shared/qrceditor/resourcefile_p.h
index 4a7d510dc48..2ec3fe47e4b 100644
--- a/src/shared/qrceditor/resourcefile_p.h
+++ b/src/shared/qrceditor/resourcefile_p.h
@@ -42,18 +42,10 @@
#include <QtCore/QStringList>
#include <QtGui/QIcon>
-#include "shared_global_p.h"
-
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
-#ifdef BUILD_VSIP
-# define RESOURCE_EXPORT
-#else
-# define RESOURCE_EXPORT QDESIGNER_SHARED_EXPORT
-#endif
-
struct File;
struct Prefix;
@@ -125,7 +117,7 @@ typedef QList<Prefix *> PrefixList;
Represents the structure of a Qt Resource File (.qrc) file.
*/
-class RESOURCE_EXPORT ResourceFile
+class ResourceFile
{
public:
ResourceFile(const QString &file_name = QString());
@@ -199,7 +191,7 @@ private:
Wraps a \l ResourceFile as a single-column tree model.
*/
-class RESOURCE_EXPORT ResourceModel : public QAbstractItemModel
+class ResourceModel : public QAbstractItemModel
{
Q_OBJECT
--
GitLab