diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/plugins/imageformats/mng/mng.pro | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/plugins/imageformats/mng/mng.pro')
| -rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro deleted file mode 100644 index 72dc506cf9..0000000000 --- a/src/plugins/imageformats/mng/mng.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qmng -load(qt_plugin) - -QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-mng)" - -symbian: { - #Disable warnings in 3rdparty code due to unused variables and arguments - QMAKE_CXXFLAGS.CW += -W nounused - TARGET.UID3=0x2001E619 -} - -include(../../../gui/image/qmnghandler.pri) -SOURCES += main.cpp - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target |