Update the macros for shared/DLL and static builds

Up until now, we had a mess of different macros used for building
DLLs, for building shared libraries on Unix systems and for building
static libraries. Some of the macros were contradictory and did not
work. From now on, there shall be only:

 - QT_STATIC: indicates that it's a static Qt build and the export
   macros should expand to empty
 - QT_SHARED: indicates that it's a shared / dynamic Qt build and the
   export macros should expand to Q_DECL_EXPORT or Q_DECL_IMPORT,
   depending on whether the macro corresponds to the current module
   being built (the QT_BUILD_XXXX_LIB macro comes from the module's
   .pro file)

QT_BOOTSTRAPPED implies QT_STATIC since the bootstrapped tools link
statically to some source code.

QT_STATIC is recorded in qconfig.h by configure when Qt is configured
for static builds. Nothing is recorded for a shared / dynamic build,
so QT_SHARED is implied if nothing is defined. This allows for the
existence of a static_and_shared build: with nothing recorded,
defining QT_STATIC before qglobal.h causes the export macros to be
that of the static form. Linking to the static libraries is out of the
scope of this change (something for the buildsystem and linker to
figure out).

From this commit on, the proper way of declaring the export macros for
a module called QtFoo is:

    #ifndef QT_STATIC
    #  ifdef QT_BUILD_FOO_LIB
    #    define Q_FOO_EXPORT Q_DECL_EXPORT
    #  else
    #    define Q_FOO_EXPORT Q_DECL_IMPORT
    #  endif
    #else
    #  define Q_FOO_EXPORT
    #endif

The type of the Qt build is recorded in QT_CONFIG (in qconfig.pri) so
all Qt modules build by default the same type of library. The keywords
are "static" and "shared", used in both QT_CONFIG and CONFIG. The
previous keyword of "staticlib" is deprecated and should not be used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2012-April/003172.html
Change-Id: I127896607794795b681c98d08467efd8af49bcf3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 9188b9a257..56d8d9f8c5 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2305,6 +2305,11 @@ void Configure::generateOutputVars()
         qtConfig += "release";
     }
 
+    if (dictionary[ "SHARED" ] == "no")
+        qtConfig += "static";
+    else
+        qtConfig += "shared";
+
     if (dictionary[ "WIDGETS" ] == "no")
         qtConfig += "no-widgets";
 
@@ -2937,10 +2942,6 @@ void Configure::generateQConfigPri()
 
         configStream << "CONFIG+= ";
         configStream << dictionary[ "BUILD" ];
-        if (dictionary[ "SHARED" ] == "yes")
-            configStream << " shared";
-        else
-            configStream << " static";
 
         if (dictionary[ "LTCG" ] == "yes")
             configStream << " ltcg";
@@ -3094,12 +3095,13 @@ void Configure::generateConfigfiles()
         }
         tmpStream << endl;
 
-        if (dictionary[ "SHARED" ] == "yes") {
-            tmpStream << "#ifndef QT_DLL" << endl;
-            tmpStream << "#define QT_DLL" << endl;
-            tmpStream << "#endif" << endl;
+        if (dictionary[ "SHARED" ] == "no") {
+            tmpStream << "/* Qt was configured for a static build */" << endl
+                      << "#if !defined(QT_SHARED) && !defined(QT_STATIC)" << endl
+                      << "# define QT_STATIC" << endl
+                      << "#endif" << endl
+                      << endl;
         }
-        tmpStream << endl;
         tmpStream << "/* License information */" << endl;
         tmpStream << "#define QT_PRODUCT_LICENSEE \"" << licenseInfo[ "LICENSEE" ] << "\"" << endl;
         tmpStream << "#define QT_PRODUCT_LICENSE \"" << dictionary[ "EDITION" ] << "\"" << endl;